diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md
index 9f8d5e49..7172d59a 100644
--- a/docs/test_cases/t00002.md
+++ b/docs/test_cases/t00002.md
@@ -116,3 +116,442 @@ private:
 ```
 ## Generated UML diagrams
 ![t00002_class](./t00002_class.svg "Basic class inheritance")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "comment": {
+        "brief": [
+          " This is class A\n"
+        ],
+        "formatted": "\\brief This is class A",
+        "paragraph": [
+          " \n"
+        ],
+        "raw": "/// \\brief This is class A",
+        "text": "\n \n"
+      },
+      "display_name": "clanguml::t00002::A",
+      "id": "987634239855407298",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "Abstract foo_a",
+            "paragraph": [
+              " Abstract foo_a\n"
+            ],
+            "raw": "/// Abstract foo_a",
+            "text": "\n Abstract foo_a\n"
+          },
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo_a",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "Abstract foo_c",
+            "paragraph": [
+              " Abstract foo_c\n"
+            ],
+            "raw": "/// Abstract foo_c",
+            "text": "\n Abstract foo_c\n"
+          },
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo_c",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00002",
+      "source_location": {
+        "file": "../../tests/t00002/t00002.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "987634239855407298",
+          "is_virtual": false,
+          "name": "clanguml::t00002::A"
+        }
+      ],
+      "comment": {
+        "brief": [
+          " This is class B\n"
+        ],
+        "formatted": "\\brief This is class B",
+        "paragraph": [
+          " \n"
+        ],
+        "raw": "/// \\brief This is class B",
+        "text": "\n \n"
+      },
+      "display_name": "clanguml::t00002::B",
+      "id": "594234458687375950",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo_a",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "B",
+      "namespace": "clanguml::t00002",
+      "source_location": {
+        "file": "../../tests/t00002/t00002.cc",
+        "line": 16
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "987634239855407298",
+          "is_virtual": false,
+          "name": "clanguml::t00002::A"
+        }
+      ],
+      "comment": {
+        "brief": [
+          " This is class C - class C has a long comment\n"
+        ],
+        "formatted": "@brief This is class C - class C has a long comment\n\nVivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\neuismod libero facilisi aptent elementum felis blandit cursus gravida sociis\nerat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\nad.",
+        "paragraph": [
+          " \n",
+          " Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad.\n"
+        ],
+        "raw": "/// @brief This is class C - class C has a long comment\n///\n/// Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n/// euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n/// erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n/// ad.",
+        "text": "\n \n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad.\n"
+      },
+      "display_name": "clanguml::t00002::C",
+      "id": "1142499429598587507",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "Do nothing unless override is provided",
+            "paragraph": [
+              " Do nothing unless override is provided\n"
+            ],
+            "raw": "/// Do nothing unless override is provided",
+            "text": "\n Do nothing unless override is provided\n"
+          },
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo_c",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "C",
+      "namespace": "clanguml::t00002",
+      "source_location": {
+        "file": "../../tests/t00002/t00002.cc",
+        "line": 27
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "594234458687375950",
+          "is_virtual": false,
+          "name": "clanguml::t00002::B"
+        },
+        {
+          "access": "public",
+          "id": "1142499429598587507",
+          "is_virtual": false,
+          "name": "clanguml::t00002::C"
+        }
+      ],
+      "comment": {
+        "formatted": "This is class D\nwhich is a little like B\nand a little like C",
+        "paragraph": [
+          " This is class D\n which is a little like B\n and a little like C\n"
+        ],
+        "raw": "/// This is class D\n/// which is a little like B\n/// and a little like C",
+        "text": "\n This is class D\n which is a little like B\n and a little like C\n"
+      },
+      "display_name": "clanguml::t00002::D",
+      "id": "60950494980414724",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "comment": {
+            "formatted": "All the A pointers",
+            "paragraph": [
+              " All the A pointers\n"
+            ],
+            "raw": "/// All the A pointers",
+            "text": "\n All the A pointers\n"
+          },
+          "is_static": false,
+          "name": "as",
+          "source_location": {
+            "file": "../../tests/t00002/t00002.cc",
+            "line": 58
+          },
+          "type": "std::vector<A *>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "\n Forward foo_a\n     ",
+            "paragraph": [
+              " Forward foo_a\n"
+            ],
+            "raw": "/**\n     * Forward foo_a\n     */",
+            "text": "\n Forward foo_a\n"
+          },
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo_a",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "\n Forward foo_c\n     ",
+            "paragraph": [
+              " Forward foo_c\n"
+            ],
+            "raw": "/**\n     * Forward foo_c\n     */",
+            "text": "\n Forward foo_c\n"
+          },
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo_c",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "D",
+      "namespace": "clanguml::t00002",
+      "source_location": {
+        "file": "../../tests/t00002/t00002.cc",
+        "line": 36
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "594234458687375950",
+          "is_virtual": true,
+          "name": "clanguml::t00002::B"
+        },
+        {
+          "access": "public",
+          "id": "1142499429598587507",
+          "is_virtual": true,
+          "name": "clanguml::t00002::C"
+        }
+      ],
+      "display_name": "clanguml::t00002::E",
+      "id": "2237886670308966220",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "comment": {
+            "formatted": "All the A pointers",
+            "paragraph": [
+              " All the A pointers\n"
+            ],
+            "raw": "/// All the A pointers",
+            "text": "\n All the A pointers\n"
+          },
+          "is_static": false,
+          "name": "as",
+          "source_location": {
+            "file": "../../tests/t00002/t00002.cc",
+            "line": 83
+          },
+          "type": "std::vector<A *>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "\n Forward foo_a",
+            "paragraph": [
+              " Forward foo_a\n"
+            ],
+            "raw": "///\n    /// Forward foo_a\n    ///",
+            "text": "\n Forward foo_a\n"
+          },
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo_a",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "\n Forward foo_c",
+            "paragraph": [
+              " Forward foo_c\n"
+            ],
+            "raw": "///\n    /// Forward foo_c\n    ///",
+            "text": "\n Forward foo_c\n"
+          },
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo_c",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "E",
+      "namespace": "clanguml::t00002",
+      "source_location": {
+        "file": "../../tests/t00002/t00002.cc",
+        "line": 61
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00002_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "987634239855407298",
+      "source": "594234458687375950",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "987634239855407298",
+      "source": "1142499429598587507",
+      "type": "extension"
+    },
+    {
+      "access": "private",
+      "destination": "987634239855407298",
+      "label": "as",
+      "source": "60950494980414724",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "594234458687375950",
+      "source": "60950494980414724",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1142499429598587507",
+      "source": "60950494980414724",
+      "type": "extension"
+    },
+    {
+      "access": "private",
+      "destination": "987634239855407298",
+      "label": "as",
+      "source": "2237886670308966220",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "594234458687375950",
+      "source": "2237886670308966220",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1142499429598587507",
+      "source": "2237886670308966220",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00002"
+}
+```
diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg
index 9633ace5..515dd8b0 100644
--- a/docs/test_cases/t00002_class.svg
+++ b/docs/test_cases/t00002_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="362px" preserveAspectRatio="none" style="width:562px;height:362px;" version="1.1" viewBox="0 0 562 362" width="562px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1k3l9dlc6rz4x" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f10dad4slql3n0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3l9dlc6rz4x)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L7" target="_top" title="This is class A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L7" xlink:show="new" xlink:title="This is class A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10dad4slql3n0)" height="73.6094" id="C_0000987634239855407298" style="stroke: #A80036; stroke-width: 1.5;" width="125" x="294" y="8"/>
       <ellipse cx="348.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M348.3594,19.3438 L347.2031,24.4219 L349.5313,24.4219 L348.3594,19.3438 Z M346.875,17.1094 L349.8594,17.1094 L353.2188,29.5 L350.7656,29.5 L350,26.4375 L346.7188,26.4375 L345.9688,29.5 L343.5313,29.5 L346.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.75" y="28.1543">A</text>
@@ -21,8 +21,8 @@
       <ellipse cx="305" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="314" y="75.0151">foo_c() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3l9dlc6rz4x)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="143"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L16" target="_top" title="This is class B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L16" xlink:show="new" xlink:title="This is class B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10dad4slql3n0)" height="60.8047" id="C_0000594234458687375950" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="69.5" y="143"/>
       <ellipse cx="111.5" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,164.6406 Q113.8906,164.9375 113.25,165.0781 Q112.6094,165.2344 111.9063,165.2344 Q109.4063,165.2344 108.0781,163.5938 Q106.7656,161.9375 106.7656,158.8125 Q106.7656,155.6875 108.0781,154.0313 Q109.4063,152.375 111.9063,152.375 Q112.6094,152.375 113.25,152.5313 Q113.9063,152.6875 114.4688,152.9844 L114.4688,155.7031 Q113.8438,155.125 113.25,154.8594 Q112.6563,154.5781 112.0313,154.5781 Q110.6875,154.5781 110,155.6563 Q109.3125,156.7188 109.3125,158.8125 Q109.3125,160.9063 110,161.9844 Q110.6875,163.0469 112.0313,163.0469 Q112.6563,163.0469 113.25,162.7813 Q113.8438,162.5 114.4688,161.9219 L114.4688,164.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.5" y="163.1543">B</text>
@@ -31,8 +31,8 @@
       <ellipse cx="80.5" cy="194" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="89.5" y="197.2104">foo_a() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3l9dlc6rz4x)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="143"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L27" target="_top" title="This is class C - class C has a long comment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L27" xlink:show="new" xlink:title="This is class C - class C has a long comment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10dad4slql3n0)" height="60.8047" id="C_0001142499429598587507" style="stroke: #A80036; stroke-width: 1.5;" width="99" x="307" y="143"/>
       <ellipse cx="348.55" cy="159" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.5188,164.6406 Q350.9406,164.9375 350.3,165.0781 Q349.6594,165.2344 348.9563,165.2344 Q346.4563,165.2344 345.1281,163.5938 Q343.8156,161.9375 343.8156,158.8125 Q343.8156,155.6875 345.1281,154.0313 Q346.4563,152.375 348.9563,152.375 Q349.6594,152.375 350.3,152.5313 Q350.9563,152.6875 351.5188,152.9844 L351.5188,155.7031 Q350.8938,155.125 350.3,154.8594 Q349.7063,154.5781 349.0813,154.5781 Q347.7375,154.5781 347.05,155.6563 Q346.3625,156.7188 346.3625,158.8125 Q346.3625,160.9063 347.05,161.9844 Q347.7375,163.0469 349.0813,163.0469 Q349.7063,163.0469 350.3,162.7813 Q350.8938,162.5 351.5188,161.9219 L351.5188,164.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="368.45" y="163.1543">C</text>
@@ -41,18 +41,18 @@
       <ellipse cx="318" cy="194" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="327" y="197.2104">foo_c() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3l9dlc6rz4x)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L36" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L36" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10dad4slql3n0)" height="86.4141" id="C_0000060950494980414724" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="33.5" y="265"/>
       <ellipse cx="98.75" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.7188,286.6406 Q101.1406,286.9375 100.5,287.0781 Q99.8594,287.2344 99.1563,287.2344 Q96.6563,287.2344 95.3281,285.5938 Q94.0156,283.9375 94.0156,280.8125 Q94.0156,277.6875 95.3281,276.0313 Q96.6563,274.375 99.1563,274.375 Q99.8594,274.375 100.5,274.5313 Q101.1563,274.6875 101.7188,274.9844 L101.7188,277.7031 Q101.0938,277.125 100.5,276.8594 Q99.9063,276.5781 99.2813,276.5781 Q97.9375,276.5781 97.25,277.6563 Q96.5625,278.7188 96.5625,280.8125 Q96.5625,282.9063 97.25,283.9844 Q97.9375,285.0469 99.2813,285.0469 Q99.9063,285.0469 100.5,284.7813 Q101.0938,284.5 101.7188,283.9219 L101.7188,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="119.25" y="285.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="39.5" y="303"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="41.5" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L58" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L58" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="53.5" y="311.2104">as : std::vector&lt;A *&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="34.5" x2="180.5" y1="317.8047" y2="317.8047"/>
@@ -60,18 +60,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="53.5" y="332.0151">foo_a() : void</text>
     <ellipse cx="44.5" cy="341.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="53.5" y="344.8198">foo_c() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1k3l9dlc6rz4x)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="265"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L61" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L61" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f10dad4slql3n0)" height="86.4141" id="C_0002237886670308966220" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="403.5" y="265"/>
       <ellipse cx="469.25" cy="281" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M472.2188,286.6406 Q471.6406,286.9375 471,287.0781 Q470.3594,287.2344 469.6563,287.2344 Q467.1563,287.2344 465.8281,285.5938 Q464.5156,283.9375 464.5156,280.8125 Q464.5156,277.6875 465.8281,276.0313 Q467.1563,274.375 469.6563,274.375 Q470.3594,274.375 471,274.5313 Q471.6563,274.6875 472.2188,274.9844 L472.2188,277.7031 Q471.5938,277.125 471,276.8594 Q470.4063,276.5781 469.7813,276.5781 Q468.4375,276.5781 467.75,277.6563 Q467.0625,278.7188 467.0625,280.8125 Q467.0625,282.9063 467.75,283.9844 Q468.4375,285.0469 469.7813,285.0469 Q470.4063,285.0469 471,284.7813 Q471.5938,284.5 472.2188,283.9219 L472.2188,286.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="489.75" y="285.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="297" y2="297"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="409.5" y="303"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="411.5" y="305"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L83" target="_top" title="as" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00002/t00002.cc#L83" xlink:show="new" xlink:title="as" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="122" x="423.5" y="311.2104">as : std::vector&lt;A *&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="404.5" x2="550.5" y1="317.8047" y2="317.8047"/>
@@ -79,13 +79,13 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="423.5" y="332.0151">foo_a() : void</text>
     <ellipse cx="414.5" cy="341.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="423.5" y="344.8198">foo_c() : void</text>
-    <path d="M150,32.5 L150,57.6328 A0,0 0 0 0 150,57.6328 L259,57.6328 A0,0 0 0 0 259,57.6328 L259,50.5 L293.74,45 L259,42.5 L259,42.5 L249,32.5 L150,32.5 A0,0 0 0 0 150,32.5 " fill="#FBFB77" filter="url(#f1k3l9dlc6rz4x)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M150,32.5 L150,57.6328 A0,0 0 0 0 150,57.6328 L259,57.6328 A0,0 0 0 0 259,57.6328 L259,50.5 L293.74,45 L259,42.5 L259,42.5 L249,32.5 L150,32.5 A0,0 0 0 0 150,32.5 " fill="#FBFB77" filter="url(#f10dad4slql3n0)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M249,32.5 L249,42.5 L259,42.5 L249,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="156" y="49.5669">This is class A</text>
-    <path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L61.94,57.6328 L105.69,142.88 L69.94,57.6328 L115,57.6328 A0,0 0 0 0 115,57.6328 L115,42.5 L105,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#f1k3l9dlc6rz4x)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,32.5 L6,57.6328 A0,0 0 0 0 6,57.6328 L61.94,57.6328 L105.69,142.88 L69.94,57.6328 L115,57.6328 A0,0 0 0 0 115,57.6328 L115,42.5 L105,32.5 L6,32.5 A0,0 0 0 0 6,32.5 " fill="#FBFB77" filter="url(#f10dad4slql3n0)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M105,32.5 L105,42.5 L115,42.5 L105,32.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="88" x="12" y="49.5669">This is class B</text>
-    <path d="M217,265 L217,304 L181.57,308 L217,312 L217,350.6641 A0,0 0 0 0 217,350.6641 L368,350.6641 A0,0 0 0 0 368,350.6641 L368,275 L358,265 L217,265 A0,0 0 0 0 217,265 " fill="#FBFB77" filter="url(#f1k3l9dlc6rz4x)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M217,265 L217,304 L181.57,308 L217,312 L217,350.6641 A0,0 0 0 0 217,350.6641 L368,350.6641 A0,0 0 0 0 368,350.6641 L368,275 L358,265 L217,265 A0,0 0 0 0 217,265 " fill="#FBFB77" filter="url(#f10dad4slql3n0)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M358,265 L358,275 L368,275 L358,265 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="235" y="282.0669"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="223" y="297.1997">This is class D</text>
diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md
index 0ef4a4d2..c7659a8b 100644
--- a/docs/test_cases/t00003.md
+++ b/docs/test_cases/t00003.md
@@ -79,3 +79,378 @@ int A::static_int = 1;
 ```
 ## Generated UML diagrams
 ![t00003_class](./t00003_class.svg "Class field and methods")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00003::A",
+      "id": "1371951663534295727",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "public_member",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 34
+          },
+          "type": "int"
+        },
+        {
+          "access": "protected",
+          "is_static": false,
+          "name": "protected_member",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 42
+          },
+          "type": "int"
+        },
+        {
+          "access": "protected",
+          "is_static": false,
+          "name": "compare",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 44
+          },
+          "type": "std::function<bool (const int)>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "private_member",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 51
+          },
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "a_",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 52
+          },
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "b_",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 52
+          },
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "c_",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 52
+          },
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_static": true,
+          "name": "static_int",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 35
+          },
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_static": true,
+          "name": "static_const_int",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 36
+          },
+          "type": "const int"
+        },
+        {
+          "access": "public",
+          "is_static": true,
+          "name": "auto_member",
+          "source_location": {
+            "file": "../../tests/t00003/t00003.cc",
+            "line": 37
+          },
+          "type": "const unsigned long"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "A",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "A",
+          "parameters": [
+            {
+              "name": "i",
+              "type": "int"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "A",
+          "parameters": [
+            {
+              "name": "",
+              "type": "clanguml::t00003::A &&"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "A",
+          "parameters": [
+            {
+              "name": "",
+              "type": "const clanguml::t00003::A &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~A",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "basic_method",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": true,
+          "is_virtual": false,
+          "name": "static_method",
+          "parameters": [],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "const_method",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "auto_method",
+          "parameters": [],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "double_int",
+          "parameters": [
+            {
+              "name": "i",
+              "type": "const int"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "sum",
+          "parameters": [
+            {
+              "name": "a",
+              "type": "const double"
+            },
+            {
+              "name": "b",
+              "type": "const double"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "default_int",
+          "parameters": [
+            {
+              "default_value": "12",
+              "name": "i",
+              "type": "int"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "default_string",
+          "parameters": [
+            {
+              "name": "i",
+              "type": "int"
+            },
+            {
+              "default_value": "\"abc\"",
+              "name": "s",
+              "type": "std::string"
+            }
+          ],
+          "type": "std::string"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": true,
+          "is_virtual": false,
+          "name": "create_from_int",
+          "parameters": [
+            {
+              "name": "i",
+              "type": "int"
+            }
+          ],
+          "type": "clanguml::t00003::A"
+        },
+        {
+          "access": "protected",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "protected_method",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "private_method",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00003",
+      "source_location": {
+        "file": "../../tests/t00003/t00003.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00003_class",
+  "relationships": [],
+  "using_namespace": "clanguml::t00003"
+}
+```
diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg
index c8d275c1..af586036 100644
--- a/docs/test_cases/t00003_class.svg
+++ b/docs/test_cases/t00003_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="398px" preserveAspectRatio="none" style="width:347px;height:398px;" version="1.1" viewBox="0 0 347 398" width="347px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jlod5pcc66lm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1tdg31le35jgp" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,74 +9,74 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jlod5pcc66lm)" height="380.9219" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tdg31le35jgp)" height="380.9219" id="C_0001371951663534295727" style="stroke: #A80036; stroke-width: 1.5;" width="329" x="7" y="7"/>
       <ellipse cx="163.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M166.2188,28.6406 Q165.6406,28.9375 165,29.0781 Q164.3594,29.2344 163.6563,29.2344 Q161.1563,29.2344 159.8281,27.5938 Q158.5156,25.9375 158.5156,22.8125 Q158.5156,19.6875 159.8281,18.0313 Q161.1563,16.375 163.6563,16.375 Q164.3594,16.375 165,16.5313 Q165.6563,16.6875 166.2188,16.9844 L166.2188,19.7031 Q165.5938,19.125 165,18.8594 Q164.4063,18.5781 163.7813,18.5781 Q162.4375,18.5781 161.75,19.6563 Q161.0625,20.7188 161.0625,22.8125 Q161.0625,24.9063 161.75,25.9844 Q162.4375,27.0469 163.7813,27.0469 Q164.4063,27.0469 165,26.7813 Q165.5938,26.5 166.2188,25.9219 L166.2188,28.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="183.75" y="27.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="39" y2="39"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="45"/>
       <ellipse cx="18" cy="50" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L34" target="_top" title="public_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L34" xlink:show="new" xlink:title="public_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="27" y="53.2104">public_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="57.8047"/>
       <polygon fill="none" points="18,57.8047,22,61.8047,18,65.8047,14,61.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L42" target="_top" title="protected_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L42" xlink:show="new" xlink:title="protected_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="27" y="66.0151">protected_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="70.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="72.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L51" target="_top" title="private_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L51" xlink:show="new" xlink:title="private_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="27" y="78.8198">private_member : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="83.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="85.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" target="_top" title="a_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="a_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="91.6245">a_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="96.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="98.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" target="_top" title="b_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="b_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="27" y="104.4292">b_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="109.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="111.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" target="_top" title="c_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L52" xlink:show="new" xlink:title="c_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="27" y="117.2339">c_ : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="121.8281"/>
       <ellipse cx="18" cy="126.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L35" target="_top" title="static_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L35" xlink:show="new" xlink:title="static_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="77" x="27" y="130.0386">static_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="134.6328"/>
       <ellipse cx="18" cy="139.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L36" target="_top" title="static_const_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L36" xlink:show="new" xlink:title="static_const_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="149" x="27" y="142.8433">static_const_int : const int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="147.4375"/>
       <ellipse cx="18" cy="152.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L37" target="_top" title="auto_member" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L37" xlink:show="new" xlink:title="auto_member" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="206" x="27" y="155.6479">auto_member : const unsigned long</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="8" x2="335" y1="162.2422" y2="162.2422"/>
@@ -112,11 +112,11 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="27" y="355.7183">protected_method() : void</text>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="15" y="362.3125"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="131" x="27" y="368.5229">private_method() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="13" y="373.1172"/>
       <polygon fill="#FFFF44" points="18,373.1172,22,377.1172,18,381.1172,14,377.1172" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L44" target="_top" title="compare" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00003/t00003.cc#L44" xlink:show="new" xlink:title="compare" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="236" x="27" y="381.3276">compare : std::function&lt;bool (const int)&gt;</text>
     </a>
   </g>
diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md
index a20b9847..384d70cc 100644
--- a/docs/test_cases/t00004.md
+++ b/docs/test_cases/t00004.md
@@ -76,3 +76,471 @@ public:
 ```
 ## Generated UML diagrams
 ![t00004_class](./t00004_class.svg "Nested classes and enums")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::B",
+      "id": "1232624428734051711",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 4
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "AA_1",
+        "AA_2",
+        "AA_3"
+      ],
+      "display_name": "clanguml::t00004::B::AA",
+      "id": "1630205507215126623",
+      "is_nested": true,
+      "name": "B::AA",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 6
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::A",
+      "id": "1552274940876611774",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::A::AA",
+      "id": "1742499843727859552",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A::AA",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "Green",
+        "Yellow",
+        "Red"
+      ],
+      "display_name": "clanguml::t00004::A::AA::Lights",
+      "id": "590936874508841244",
+      "is_nested": true,
+      "name": "A::AA::Lights",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 15
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::A::AA::AAA",
+      "id": "1430186633004282131",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A::AA::AAA",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::C::B<int>",
+      "id": "287819369330075965",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C::B",
+      "namespace": "clanguml::t00004",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::C<T>",
+      "id": "2278328177727440136",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "t",
+          "source_location": {
+            "file": "../../tests/t00004/t00004.cc",
+            "line": 25
+          },
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b_int",
+          "source_location": {
+            "file": "../../tests/t00004/t00004.cc",
+            "line": 37
+          },
+          "type": "B<int>"
+        }
+      ],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 23
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::C::AA",
+      "id": "623940132897927654",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C::AA",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 27
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::C::AA::AAA",
+      "id": "1597801087286500866",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C::AA::AAA",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 28
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "CCC_1",
+        "CCC_2"
+      ],
+      "display_name": "clanguml::t00004::C::AA::CCC",
+      "id": "81819202639599734",
+      "is_nested": true,
+      "name": "C::AA::CCC",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 30
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::C::B<V>",
+      "id": "1381298335849583950",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00004/t00004.cc",
+            "line": 34
+          },
+          "type": "V"
+        }
+      ],
+      "methods": [],
+      "name": "C::B",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 33
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "V",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "CC_1",
+        "CC_2"
+      ],
+      "display_name": "clanguml::t00004::C::CC",
+      "id": "2037378936100378699",
+      "is_nested": true,
+      "name": "C::CC",
+      "namespace": "clanguml::t00004",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 39
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::detail::D",
+      "id": "612133170877135796",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00004::detail",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 43
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "AA_1",
+        "AA_2",
+        "AA_3"
+      ],
+      "display_name": "clanguml::t00004::detail::D::AA",
+      "id": "1572080057917630922",
+      "is_nested": true,
+      "name": "D::AA",
+      "namespace": "clanguml::t00004::detail",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 45
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00004::detail::D::DD",
+      "id": "600916232677555492",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D::DD",
+      "namespace": "clanguml::t00004::detail",
+      "source_location": {
+        "file": "../../tests/t00004/t00004.cc",
+        "line": 47
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00004_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1232624428734051711",
+      "source": "1630205507215126623",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "1552274940876611774",
+      "source": "1742499843727859552",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "1742499843727859552",
+      "source": "590936874508841244",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "1742499843727859552",
+      "source": "1430186633004282131",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "1381298335849583950",
+      "source": "287819369330075965",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "287819369330075965",
+      "label": "b_int",
+      "source": "2278328177727440136",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "2278328177727440136",
+      "source": "623940132897927654",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "623940132897927654",
+      "source": "1597801087286500866",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "623940132897927654",
+      "source": "81819202639599734",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "2278328177727440136",
+      "source": "1381298335849583950",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "2278328177727440136",
+      "source": "2037378936100378699",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "612133170877135796",
+      "source": "1572080057917630922",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "612133170877135796",
+      "source": "600916232677555492",
+      "type": "containment"
+    }
+  ],
+  "using_namespace": "clanguml::t00004"
+}
+```
diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg
index 5056564a..40b69332 100644
--- a/docs/test_cases/t00004_class.svg
+++ b/docs/test_cases/t00004_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="374px" preserveAspectRatio="none" style="width:1071px;height:374px;" version="1.1" viewBox="0 0 1071 374" width="1071px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1c3tz7kwyx6hg" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fu36xpoyd10nq" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="48" id="C_0001232624428734051711" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="18" y="168"/>
       <ellipse cx="33" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M35.9688,189.6406 Q35.3906,189.9375 34.75,190.0781 Q34.1094,190.2344 33.4063,190.2344 Q30.9063,190.2344 29.5781,188.5938 Q28.2656,186.9375 28.2656,183.8125 Q28.2656,180.6875 29.5781,179.0313 Q30.9063,177.375 33.4063,177.375 Q34.1094,177.375 34.75,177.5313 Q35.4063,177.6875 35.9688,177.9844 L35.9688,180.7031 Q35.3438,180.125 34.75,179.8594 Q34.1563,179.5781 33.5313,179.5781 Q32.1875,179.5781 31.5,180.6563 Q30.8125,181.7188 30.8125,183.8125 Q30.8125,185.9063 31.5,186.9844 Q32.1875,188.0469 33.5313,188.0469 Q34.1563,188.0469 34.75,187.7813 Q35.3438,187.5 35.9688,186.9219 L35.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="188.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="57" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L6" target="_top" title="B##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L6" xlink:show="new" xlink:title="B##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="86.4141" id="C_0001630205507215126623" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M25.1094,30 L17.3906,30 L17.3906,17.6094 L25.1094,17.6094 L25.1094,19.7656 L19.8438,19.7656 L19.8438,22.4375 L24.6094,22.4375 L24.6094,24.5938 L19.8438,24.5938 L19.8438,27.8438 L25.1094,27.8438 L25.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="35" y="28.1543">B::AA</text>
@@ -28,8 +28,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="12" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="69" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="73.6094" id="C_0001552274940876611774" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="176.5" y="290"/>
       <ellipse cx="232.75" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,311.6406 Q235.1406,311.9375 234.5,312.0781 Q233.8594,312.2344 233.1563,312.2344 Q230.6563,312.2344 229.3281,310.5938 Q228.0156,308.9375 228.0156,305.8125 Q228.0156,302.6875 229.3281,301.0313 Q230.6563,299.375 233.1563,299.375 Q233.8594,299.375 234.5,299.5313 Q235.1563,299.6875 235.7188,299.9844 L235.7188,302.7031 Q235.0938,302.125 234.5,301.8594 Q233.9063,301.5781 233.2813,301.5781 Q231.9375,301.5781 231.25,302.6563 Q230.5625,303.7188 230.5625,305.8125 Q230.5625,307.9063 231.25,308.9844 Q231.9375,310.0469 233.2813,310.0469 Q233.9063,310.0469 234.5,309.7813 Q235.0938,309.5 235.7188,308.9219 L235.7188,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="253.25" y="310.1543">A</text>
@@ -40,16 +40,16 @@
       <ellipse cx="187.5" cy="353.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="103" x="196.5" y="357.0151">foo2() const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L13" target="_top" title="A##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L13" xlink:show="new" xlink:title="A##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="48" id="C_0001742499843727859552" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="209" y="168"/>
       <ellipse cx="224" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M226.9688,189.6406 Q226.3906,189.9375 225.75,190.0781 Q225.1094,190.2344 224.4063,190.2344 Q221.9063,190.2344 220.5781,188.5938 Q219.2656,186.9375 219.2656,183.8125 Q219.2656,180.6875 220.5781,179.0313 Q221.9063,177.375 224.4063,177.375 Q225.1094,177.375 225.75,177.5313 Q226.4063,177.6875 226.9688,177.9844 L226.9688,180.7031 Q226.3438,180.125 225.75,179.8594 Q225.1563,179.5781 224.5313,179.5781 Q223.1875,179.5781 222.5,180.6563 Q221.8125,181.7188 221.8125,183.8125 Q221.8125,185.9063 222.5,186.9844 Q223.1875,188.0469 224.5313,188.0469 Q225.1563,188.0469 225.75,187.7813 Q226.3438,187.5 226.9688,186.9219 L226.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="238" y="188.1543">A::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="210" x2="272" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L15" target="_top" title="A##AA##Lights" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L15" xlink:show="new" xlink:title="A##AA##Lights" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="86.4141" id="C_0000590936874508841244" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="105.5" y="8"/>
       <ellipse cx="120.5" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.6094,30 L116.8906,30 L116.8906,17.6094 L124.6094,17.6094 L124.6094,19.7656 L119.3438,19.7656 L119.3438,22.4375 L124.1094,22.4375 L124.1094,24.5938 L119.3438,24.5938 L119.3438,27.8438 L124.6094,27.8438 L124.6094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="77" x="134.5" y="28.1543">A::AA::Lights</text>
@@ -59,15 +59,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="111.5" y="79.8198">Red</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="106.5" x2="213.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L17" target="_top" title="A##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L17" xlink:show="new" xlink:title="A##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="48" id="C_0001430186633004282131" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="250" y="27"/>
       <ellipse cx="265" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M267.9688,48.6406 Q267.3906,48.9375 266.75,49.0781 Q266.1094,49.2344 265.4063,49.2344 Q262.9063,49.2344 261.5781,47.5938 Q260.2656,45.9375 260.2656,42.8125 Q260.2656,39.6875 261.5781,38.0313 Q262.9063,36.375 265.4063,36.375 Q266.1094,36.375 266.75,36.5313 Q267.4063,36.6875 267.9688,36.9844 L267.9688,39.7031 Q267.3438,39.125 266.75,38.8594 Q266.1563,38.5781 265.5313,38.5781 Q264.1875,38.5781 263.5,39.6563 Q262.8125,40.7188 262.8125,42.8125 Q262.8125,44.9063 263.5,45.9844 Q264.1875,47.0469 265.5313,47.0469 Q266.1563,47.0469 266.75,46.7813 Q267.3438,46.5 267.9688,45.9219 L267.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="279" y="47.1543">A::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="345" y1="67" y2="67"/>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
+    <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="48" id="C_0000287819369330075965" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="418" y="27"/>
     <ellipse cx="433" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M435.9688,48.6406 Q435.3906,48.9375 434.75,49.0781 Q434.1094,49.2344 433.4063,49.2344 Q430.9063,49.2344 429.5781,47.5938 Q428.2656,45.9375 428.2656,42.8125 Q428.2656,39.6875 429.5781,38.0313 Q430.9063,36.375 433.4063,36.375 Q434.1094,36.375 434.75,36.5313 Q435.4063,36.6875 435.9688,36.9844 L435.9688,39.7031 Q435.3438,39.125 434.75,38.8594 Q434.1563,38.5781 433.5313,38.5781 Q432.1875,38.5781 431.5,39.6563 Q430.8125,40.7188 430.8125,42.8125 Q430.8125,44.9063 431.5,45.9844 Q432.1875,47.0469 433.5313,47.0469 Q434.1563,47.0469 434.75,46.7813 Q435.3438,46.5 435.9688,45.9219 L435.9688,48.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="447" y="47.1543">C::B</text>
@@ -75,8 +75,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="480" y="36.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="59" y2="59"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="419" x2="493" y1="67" y2="67"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L23" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L23" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="73.6094" id="C_0002278328177727440136" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="490.5" y="290"/>
       <ellipse cx="529.8" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M532.7688,311.6406 Q532.1906,311.9375 531.55,312.0781 Q530.9094,312.2344 530.2063,312.2344 Q527.7063,312.2344 526.3781,310.5938 Q525.0656,308.9375 525.0656,305.8125 Q525.0656,302.6875 526.3781,301.0313 Q527.7063,299.375 530.2063,299.375 Q530.9094,299.375 531.55,299.5313 Q532.2063,299.6875 532.7688,299.9844 L532.7688,302.7031 Q532.1438,302.125 531.55,301.8594 Q530.9563,301.5781 530.3313,301.5781 Q528.9875,301.5781 528.3,302.6563 Q527.6125,303.7188 527.6125,305.8125 Q527.6125,307.9063 528.3,308.9844 Q528.9875,310.0469 530.3313,310.0469 Q530.9563,310.0469 531.55,309.7813 Q532.1438,309.5 532.7688,308.9219 L532.7688,311.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="549.2" y="310.1543">C</text>
@@ -84,39 +84,39 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="590.5" y="299.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="322" y2="322"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="328"/>
       <ellipse cx="501.5" cy="333" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L25" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L25" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="510.5" y="336.2104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="496.5" y="340.8047"/>
       <ellipse cx="501.5" cy="345.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L37" target="_top" title="b_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L37" xlink:show="new" xlink:title="b_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="510.5" y="349.0151">b_int : B&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="491.5" x2="594.5" y1="355.6094" y2="355.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L27" target="_top" title="C##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L27" xlink:show="new" xlink:title="C##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="48" id="C_0000623940132897927654" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="584" y="168"/>
       <ellipse cx="599" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M601.9688,189.6406 Q601.3906,189.9375 600.75,190.0781 Q600.1094,190.2344 599.4063,190.2344 Q596.9063,190.2344 595.5781,188.5938 Q594.2656,186.9375 594.2656,183.8125 Q594.2656,180.6875 595.5781,179.0313 Q596.9063,177.375 599.4063,177.375 Q600.1094,177.375 600.75,177.5313 Q601.4063,177.6875 601.9688,177.9844 L601.9688,180.7031 Q601.3438,180.125 600.75,179.8594 Q600.1563,179.5781 599.5313,179.5781 Q598.1875,179.5781 597.5,180.6563 Q596.8125,181.7188 596.8125,183.8125 Q596.8125,185.9063 597.5,186.9844 Q598.1875,188.0469 599.5313,188.0469 Q600.1563,188.0469 600.75,187.7813 Q601.3438,187.5 601.9688,186.9219 L601.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="613" y="188.1543">C::AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="585" x2="647" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L28" target="_top" title="C##AA##AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L28" xlink:show="new" xlink:title="C##AA##AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="48" id="C_0001597801087286500866" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="545" y="27"/>
       <ellipse cx="560" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M562.9688,48.6406 Q562.3906,48.9375 561.75,49.0781 Q561.1094,49.2344 560.4063,49.2344 Q557.9063,49.2344 556.5781,47.5938 Q555.2656,45.9375 555.2656,42.8125 Q555.2656,39.6875 556.5781,38.0313 Q557.9063,36.375 560.4063,36.375 Q561.1094,36.375 561.75,36.5313 Q562.4063,36.6875 562.9688,36.9844 L562.9688,39.7031 Q562.3438,39.125 561.75,38.8594 Q561.1563,38.5781 560.5313,38.5781 Q559.1875,38.5781 558.5,39.6563 Q557.8125,40.7188 557.8125,42.8125 Q557.8125,44.9063 558.5,45.9844 Q559.1875,47.0469 560.5313,47.0469 Q561.1563,47.0469 561.75,46.7813 Q562.3438,46.5 562.9688,45.9219 L562.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="574" y="47.1543">C::AA::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="546" x2="640" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L30" target="_top" title="C##AA##CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L30" xlink:show="new" xlink:title="C##AA##CCC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="73.6094" id="C_0000081819202639599734" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="676" y="14"/>
       <ellipse cx="691" cy="30" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M695.1094,36 L687.3906,36 L687.3906,23.6094 L695.1094,23.6094 L695.1094,25.7656 L689.8438,25.7656 L689.8438,28.4375 L694.6094,28.4375 L694.6094,30.5938 L689.8438,30.5938 L689.8438,33.8438 L695.1094,33.8438 L695.1094,36 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="705" y="34.1543">C::AA::CCC</text>
@@ -125,8 +125,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="682" y="73.0151">CCC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="677" x2="771" y1="79.6094" y2="79.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L33" target="_top" title="C##B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L33" xlink:show="new" xlink:title="C##B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="60.8047" id="C_0001381298335849583950" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="366" y="161.5"/>
       <ellipse cx="381" cy="177.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.9688,183.1406 Q383.3906,183.4375 382.75,183.5781 Q382.1094,183.7344 381.4063,183.7344 Q378.9063,183.7344 377.5781,182.0938 Q376.2656,180.4375 376.2656,177.3125 Q376.2656,174.1875 377.5781,172.5313 Q378.9063,170.875 381.4063,170.875 Q382.1094,170.875 382.75,171.0313 Q383.4063,171.1875 383.9688,171.4844 L383.9688,174.2031 Q383.3438,173.625 382.75,173.3594 Q382.1563,173.0781 381.5313,173.0781 Q380.1875,173.0781 379.5,174.1563 Q378.8125,175.2188 378.8125,177.3125 Q378.8125,179.4063 379.5,180.4844 Q380.1875,181.5469 381.5313,181.5469 Q382.1563,181.5469 382.75,181.2813 Q383.3438,181 383.9688,180.4219 L383.9688,183.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="395" y="181.6543">C::B</text>
@@ -134,16 +134,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="428" y="170.6387">V</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="193.5" y2="193.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="372" y="199.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="374" y="201.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="386" y="207.7104">b : V</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="367" x2="433" y1="214.3047" y2="214.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L39" target="_top" title="C##CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L39" xlink:show="new" xlink:title="C##CC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="73.6094" id="C_0002037378936100378699" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="683" y="155"/>
       <ellipse cx="698" cy="171" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M702.1094,177 L694.3906,177 L694.3906,164.6094 L702.1094,164.6094 L702.1094,166.7656 L696.8438,166.7656 L696.8438,169.4375 L701.6094,169.4375 L701.6094,171.5938 L696.8438,171.5938 L696.8438,174.8438 L702.1094,174.8438 L702.1094,177 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="712" y="175.1543">C::CC</text>
@@ -152,16 +152,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="29" x="689" y="214.0151">CC_2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="684" x2="746" y1="220.6094" y2="220.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L43" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L43" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="48" id="C_0000612133170877135796" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="891" y="168"/>
       <ellipse cx="906" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M908.9688,189.6406 Q908.3906,189.9375 907.75,190.0781 Q907.1094,190.2344 906.4063,190.2344 Q903.9063,190.2344 902.5781,188.5938 Q901.2656,186.9375 901.2656,183.8125 Q901.2656,180.6875 902.5781,179.0313 Q903.9063,177.375 906.4063,177.375 Q907.1094,177.375 907.75,177.5313 Q908.4063,177.6875 908.9688,177.9844 L908.9688,180.7031 Q908.3438,180.125 907.75,179.8594 Q907.1563,179.5781 906.5313,179.5781 Q905.1875,179.5781 904.5,180.6563 Q903.8125,181.7188 903.8125,183.8125 Q903.8125,185.9063 904.5,186.9844 Q905.1875,188.0469 906.5313,188.0469 Q907.1563,188.0469 907.75,187.7813 Q908.3438,187.5 908.9688,186.9219 L908.9688,189.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="920" y="188.1543">detail::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="200" y2="200"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="892" x2="974" y1="208" y2="208"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L45" target="_top" title="D##AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L45" xlink:show="new" xlink:title="D##AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="86.4141" id="C_0001572080057917630922" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="807" y="8"/>
       <ellipse cx="822" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M826.1094,30 L818.3906,30 L818.3906,17.6094 L826.1094,17.6094 L826.1094,19.7656 L820.8438,19.7656 L820.8438,22.4375 L825.6094,22.4375 L825.6094,24.5938 L820.8438,24.5938 L820.8438,27.8438 L826.1094,27.8438 L826.1094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="836" y="28.1543">detail::D::AA</text>
@@ -171,8 +171,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="27" x="813" y="79.8198">AA_3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="808" x2="914" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1c3tz7kwyx6hg)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L47" target="_top" title="D##DD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00004/t00004.cc#L47" xlink:show="new" xlink:title="D##DD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fu36xpoyd10nq)" height="48" id="C_0000600916232677555492" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="950" y="27"/>
       <ellipse cx="965" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M967.9688,48.6406 Q967.3906,48.9375 966.75,49.0781 Q966.1094,49.2344 965.4063,49.2344 Q962.9063,49.2344 961.5781,47.5938 Q960.2656,45.9375 960.2656,42.8125 Q960.2656,39.6875 961.5781,38.0313 Q962.9063,36.375 965.4063,36.375 Q966.1094,36.375 966.75,36.5313 Q967.4063,36.6875 967.9688,36.9844 L967.9688,39.7031 Q967.3438,39.125 966.75,38.8594 Q966.1563,38.5781 965.5313,38.5781 Q964.1875,38.5781 963.5,39.6563 Q962.8125,40.7188 962.8125,42.8125 Q962.8125,44.9063 963.5,45.9844 Q964.1875,47.0469 965.5313,47.0469 Q966.1563,47.0469 966.75,46.7813 Q967.3438,46.5 967.9688,45.9219 L967.9688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="78" x="979" y="47.1543">detail::D::DD</text>
diff --git a/docs/test_cases/t00005.md b/docs/test_cases/t00005.md
index 7e566ae1..c06bf9bc 100644
--- a/docs/test_cases/t00005.md
+++ b/docs/test_cases/t00005.md
@@ -66,3 +66,483 @@ public:
 ```
 ## Generated UML diagrams
 ![t00005_class](./t00005_class.svg "Basic class field relationships")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::A",
+      "id": "96355893895780319",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 3
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::B",
+      "id": "1909425857334087541",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 5
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::C",
+      "id": "968176384460064907",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::D",
+      "id": "1735599590836186693",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::E",
+      "id": "887960136921844658",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::F",
+      "id": "772719357856231772",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::G",
+      "id": "979147885884736437",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 15
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::H",
+      "id": "1440673301054236675",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "H",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::I",
+      "id": "109681731550086430",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "I",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 19
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::J",
+      "id": "338330011969650325",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "J",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 21
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::K",
+      "id": "2179119389830432509",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "K",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 23
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00005::R",
+      "id": "630692407373144211",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "some_int",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 27
+          },
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "some_int_pointer",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 28
+          },
+          "type": "int *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "some_int_pointer_pointer",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 29
+          },
+          "type": "int **"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "some_int_reference",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 30
+          },
+          "type": "int &"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 31
+          },
+          "type": "clanguml::t00005::A"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 32
+          },
+          "type": "clanguml::t00005::B *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 33
+          },
+          "type": "clanguml::t00005::C &"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "d",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 34
+          },
+          "type": "const clanguml::t00005::D *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 35
+          },
+          "type": "const clanguml::t00005::E &"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 36
+          },
+          "type": "clanguml::t00005::F &&"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "g",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 37
+          },
+          "type": "clanguml::t00005::G **"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "h",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 38
+          },
+          "type": "clanguml::t00005::H ***"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "i",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 39
+          },
+          "type": "clanguml::t00005::I *&"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "j",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 40
+          },
+          "type": "volatile clanguml::t00005::J *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "k",
+          "source_location": {
+            "file": "../../tests/t00005/t00005.cc",
+            "line": 41
+          },
+          "type": "clanguml::t00005::K *"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00005",
+      "source_location": {
+        "file": "../../tests/t00005/t00005.cc",
+        "line": 25
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00005_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "96355893895780319",
+      "label": "a",
+      "source": "630692407373144211",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1909425857334087541",
+      "label": "b",
+      "source": "630692407373144211",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "968176384460064907",
+      "label": "c",
+      "source": "630692407373144211",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1735599590836186693",
+      "label": "d",
+      "source": "630692407373144211",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "887960136921844658",
+      "label": "e",
+      "source": "630692407373144211",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "772719357856231772",
+      "label": "f",
+      "source": "630692407373144211",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "979147885884736437",
+      "label": "g",
+      "source": "630692407373144211",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1440673301054236675",
+      "label": "h",
+      "source": "630692407373144211",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "109681731550086430",
+      "label": "i",
+      "source": "630692407373144211",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "338330011969650325",
+      "label": "j",
+      "source": "630692407373144211",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "2179119389830432509",
+      "label": "k",
+      "source": "630692407373144211",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00005"
+}
+```
diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg
index 0fa870af..a682e90a 100644
--- a/docs/test_cases/t00005_class.svg
+++ b/docs/test_cases/t00005_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="384px" preserveAspectRatio="none" style="width:799px;height:384px;" version="1.1" viewBox="0 0 799 384" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1w8amttaun1mk" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fdkqct9cirgt3" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,204 +9,204 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0000096355893895780319" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="325"/>
       <ellipse cx="21" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,346.6406 Q23.3906,346.9375 22.75,347.0781 Q22.1094,347.2344 21.4063,347.2344 Q18.9063,347.2344 17.5781,345.5938 Q16.2656,343.9375 16.2656,340.8125 Q16.2656,337.6875 17.5781,336.0313 Q18.9063,334.375 21.4063,334.375 Q22.1094,334.375 22.75,334.5313 Q23.4063,334.6875 23.9688,334.9844 L23.9688,337.7031 Q23.3438,337.125 22.75,336.8594 Q22.1563,336.5781 21.5313,336.5781 Q20.1875,336.5781 19.5,337.6563 Q18.8125,338.7188 18.8125,340.8125 Q18.8125,342.9063 19.5,343.9844 Q20.1875,345.0469 21.5313,345.0469 Q22.1563,345.0469 22.75,344.7813 Q23.3438,344.5 23.9688,343.9219 L23.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="345.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0001909425857334087541" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="325"/>
       <ellipse cx="96" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,346.6406 Q98.3906,346.9375 97.75,347.0781 Q97.1094,347.2344 96.4063,347.2344 Q93.9063,347.2344 92.5781,345.5938 Q91.2656,343.9375 91.2656,340.8125 Q91.2656,337.6875 92.5781,336.0313 Q93.9063,334.375 96.4063,334.375 Q97.1094,334.375 97.75,334.5313 Q98.4063,334.6875 98.9688,334.9844 L98.9688,337.7031 Q98.3438,337.125 97.75,336.8594 Q97.1563,336.5781 96.5313,336.5781 Q95.1875,336.5781 94.5,337.6563 Q93.8125,338.7188 93.8125,340.8125 Q93.8125,342.9063 94.5,343.9844 Q95.1875,345.0469 96.5313,345.0469 Q97.1563,345.0469 97.75,344.7813 Q98.3438,344.5 98.9688,343.9219 L98.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="345.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0000968176384460064907" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="325"/>
       <ellipse cx="171" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,346.6406 Q173.3906,346.9375 172.75,347.0781 Q172.1094,347.2344 171.4063,347.2344 Q168.9063,347.2344 167.5781,345.5938 Q166.2656,343.9375 166.2656,340.8125 Q166.2656,337.6875 167.5781,336.0313 Q168.9063,334.375 171.4063,334.375 Q172.1094,334.375 172.75,334.5313 Q173.4063,334.6875 173.9688,334.9844 L173.9688,337.7031 Q173.3438,337.125 172.75,336.8594 Q172.1563,336.5781 171.5313,336.5781 Q170.1875,336.5781 169.5,337.6563 Q168.8125,338.7188 168.8125,340.8125 Q168.8125,342.9063 169.5,343.9844 Q170.1875,345.0469 171.5313,345.0469 Q172.1563,345.0469 172.75,344.7813 Q173.3438,344.5 173.9688,343.9219 L173.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="345.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0001735599590836186693" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="325"/>
       <ellipse cx="246.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,346.6406 Q248.8906,346.9375 248.25,347.0781 Q247.6094,347.2344 246.9063,347.2344 Q244.4063,347.2344 243.0781,345.5938 Q241.7656,343.9375 241.7656,340.8125 Q241.7656,337.6875 243.0781,336.0313 Q244.4063,334.375 246.9063,334.375 Q247.6094,334.375 248.25,334.5313 Q248.9063,334.6875 249.4688,334.9844 L249.4688,337.7031 Q248.8438,337.125 248.25,336.8594 Q247.6563,336.5781 247.0313,336.5781 Q245.6875,336.5781 245,337.6563 Q244.3125,338.7188 244.3125,340.8125 Q244.3125,342.9063 245,343.9844 Q245.6875,345.0469 247.0313,345.0469 Q247.6563,345.0469 248.25,344.7813 Q248.8438,344.5 249.4688,343.9219 L249.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="345.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L11" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L11" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0000887960136921844658" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="325"/>
       <ellipse cx="323" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,346.6406 Q325.3906,346.9375 324.75,347.0781 Q324.1094,347.2344 323.4063,347.2344 Q320.9063,347.2344 319.5781,345.5938 Q318.2656,343.9375 318.2656,340.8125 Q318.2656,337.6875 319.5781,336.0313 Q320.9063,334.375 323.4063,334.375 Q324.1094,334.375 324.75,334.5313 Q325.4063,334.6875 325.9688,334.9844 L325.9688,337.7031 Q325.3438,337.125 324.75,336.8594 Q324.1563,336.5781 323.5313,336.5781 Q322.1875,336.5781 321.5,337.6563 Q320.8125,338.7188 320.8125,340.8125 Q320.8125,342.9063 321.5,343.9844 Q322.1875,345.0469 323.5313,345.0469 Q324.1563,345.0469 324.75,344.7813 Q325.3438,344.5 325.9688,343.9219 L325.9688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="345.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L13" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L13" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0000772719357856231772" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="325"/>
       <ellipse cx="398.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,346.6406 Q400.8906,346.9375 400.25,347.0781 Q399.6094,347.2344 398.9063,347.2344 Q396.4063,347.2344 395.0781,345.5938 Q393.7656,343.9375 393.7656,340.8125 Q393.7656,337.6875 395.0781,336.0313 Q396.4063,334.375 398.9063,334.375 Q399.6094,334.375 400.25,334.5313 Q400.9063,334.6875 401.4688,334.9844 L401.4688,337.7031 Q400.8438,337.125 400.25,336.8594 Q399.6563,336.5781 399.0313,336.5781 Q397.6875,336.5781 397,337.6563 Q396.3125,338.7188 396.3125,340.8125 Q396.3125,342.9063 397,343.9844 Q397.6875,345.0469 399.0313,345.0469 Q399.6563,345.0469 400.25,344.7813 Q400.8438,344.5 401.4688,343.9219 L401.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="345.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L15" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L15" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0000979147885884736437" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="325"/>
       <ellipse cx="472.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,346.6406 Q474.8906,346.9375 474.25,347.0781 Q473.6094,347.2344 472.9063,347.2344 Q470.4063,347.2344 469.0781,345.5938 Q467.7656,343.9375 467.7656,340.8125 Q467.7656,337.6875 469.0781,336.0313 Q470.4063,334.375 472.9063,334.375 Q473.6094,334.375 474.25,334.5313 Q474.9063,334.6875 475.4688,334.9844 L475.4688,337.7031 Q474.8438,337.125 474.25,336.8594 Q473.6563,336.5781 473.0313,336.5781 Q471.6875,336.5781 471,337.6563 Q470.3125,338.7188 470.3125,340.8125 Q470.3125,342.9063 471,343.9844 Q471.6875,345.0469 473.0313,345.0469 Q473.6563,345.0469 474.25,344.7813 Q474.8438,344.5 475.4688,343.9219 L475.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="345.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L17" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L17" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0001440673301054236675" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="325"/>
       <ellipse cx="548.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,346.6406 Q550.8906,346.9375 550.25,347.0781 Q549.6094,347.2344 548.9063,347.2344 Q546.4063,347.2344 545.0781,345.5938 Q543.7656,343.9375 543.7656,340.8125 Q543.7656,337.6875 545.0781,336.0313 Q546.4063,334.375 548.9063,334.375 Q549.6094,334.375 550.25,334.5313 Q550.9063,334.6875 551.4688,334.9844 L551.4688,337.7031 Q550.8438,337.125 550.25,336.8594 Q549.6563,336.5781 549.0313,336.5781 Q547.6875,336.5781 547,337.6563 Q546.3125,338.7188 546.3125,340.8125 Q546.3125,342.9063 547,343.9844 Q547.6875,345.0469 549.0313,345.0469 Q549.6563,345.0469 550.25,344.7813 Q550.8438,344.5 551.4688,343.9219 L551.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="345.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L19" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L19" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0000109681731550086430" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="325"/>
       <ellipse cx="624.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,346.6406 Q626.8906,346.9375 626.25,347.0781 Q625.6094,347.2344 624.9063,347.2344 Q622.4063,347.2344 621.0781,345.5938 Q619.7656,343.9375 619.7656,340.8125 Q619.7656,337.6875 621.0781,336.0313 Q622.4063,334.375 624.9063,334.375 Q625.6094,334.375 626.25,334.5313 Q626.9063,334.6875 627.4688,334.9844 L627.4688,337.7031 Q626.8438,337.125 626.25,336.8594 Q625.6563,336.5781 625.0313,336.5781 Q623.6875,336.5781 623,337.6563 Q622.3125,338.7188 622.3125,340.8125 Q622.3125,342.9063 623,343.9844 Q623.6875,345.0469 625.0313,345.0469 Q625.6563,345.0469 626.25,344.7813 Q626.8438,344.5 627.4688,343.9219 L627.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="345.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L21" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L21" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0000338330011969650325" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="325"/>
       <ellipse cx="694.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,346.6406 Q696.8906,346.9375 696.25,347.0781 Q695.6094,347.2344 694.9063,347.2344 Q692.4063,347.2344 691.0781,345.5938 Q689.7656,343.9375 689.7656,340.8125 Q689.7656,337.6875 691.0781,336.0313 Q692.4063,334.375 694.9063,334.375 Q695.6094,334.375 696.25,334.5313 Q696.9063,334.6875 697.4688,334.9844 L697.4688,337.7031 Q696.8438,337.125 696.25,336.8594 Q695.6563,336.5781 695.0313,336.5781 Q693.6875,336.5781 693,337.6563 Q692.3125,338.7188 692.3125,340.8125 Q692.3125,342.9063 693,343.9844 Q693.6875,345.0469 695.0313,345.0469 Q695.6563,345.0469 696.25,344.7813 Q696.8438,344.5 697.4688,343.9219 L697.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="345.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L23" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L23" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="48" id="C_0002179119389830432509" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="325"/>
       <ellipse cx="764.5" cy="341" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,346.6406 Q766.8906,346.9375 766.25,347.0781 Q765.6094,347.2344 764.9063,347.2344 Q762.4063,347.2344 761.0781,345.5938 Q759.7656,343.9375 759.7656,340.8125 Q759.7656,337.6875 761.0781,336.0313 Q762.4063,334.375 764.9063,334.375 Q765.6094,334.375 766.25,334.5313 Q766.9063,334.6875 767.4688,334.9844 L767.4688,337.7031 Q766.8438,337.125 766.25,336.8594 Q765.6563,336.5781 765.0313,336.5781 Q763.6875,336.5781 763,337.6563 Q762.3125,338.7188 762.3125,340.8125 Q762.3125,342.9063 763,343.9844 Q763.6875,345.0469 765.0313,345.0469 Q765.6563,345.0469 766.25,344.7813 Q766.8438,344.5 767.4688,343.9219 L767.4688,346.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="345.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="357" y2="357"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="365" y2="365"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1w8amttaun1mk)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L25" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L25" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fdkqct9cirgt3)" height="240.0703" id="C_0000630692407373144211" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="297" y="8"/>
       <ellipse cx="394.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M397.7188,29.6406 Q397.1406,29.9375 396.5,30.0781 Q395.8594,30.2344 395.1563,30.2344 Q392.6563,30.2344 391.3281,28.5938 Q390.0156,26.9375 390.0156,23.8125 Q390.0156,20.6875 391.3281,19.0313 Q392.6563,17.375 395.1563,17.375 Q395.8594,17.375 396.5,17.5313 Q397.1563,17.6875 397.7188,17.9844 L397.7188,20.7031 Q397.0938,20.125 396.5,19.8594 Q395.9063,19.5781 395.2813,19.5781 Q393.9375,19.5781 393.25,20.6563 Q392.5625,21.7188 392.5625,23.8125 Q392.5625,25.9063 393.25,26.9844 Q393.9375,28.0469 395.2813,28.0469 Q395.9063,28.0469 396.5,27.7813 Q397.0938,27.5 397.7188,26.9219 L397.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="415.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="46"/>
       <ellipse cx="308" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L27" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L27" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="317" y="54.2104">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="58.8047"/>
       <ellipse cx="308" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L28" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L28" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="317" y="67.0151">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="71.6094"/>
       <ellipse cx="308" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L29" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L29" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="317" y="79.8198">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="84.4141"/>
       <ellipse cx="308" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L30" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L30" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="317" y="92.6245">some_int_reference : int &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="97.2188"/>
       <ellipse cx="308" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="317" y="105.4292">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="110.0234"/>
       <ellipse cx="308" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L32" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L32" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="317" y="118.2339">b : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="122.8281"/>
       <ellipse cx="308" cy="127.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L33" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L33" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="317" y="131.0386">c : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="135.6328"/>
       <ellipse cx="308" cy="140.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L34" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L34" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="143.8433">d : const D *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="148.4375"/>
       <ellipse cx="308" cy="153.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L35" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L35" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="75" x="317" y="156.6479">e : const E &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="161.2422"/>
       <ellipse cx="308" cy="166.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L36" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L36" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="317" y="169.4526">f : F &amp;&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="174.0469"/>
       <ellipse cx="308" cy="179.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L37" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L37" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="44" x="317" y="182.2573">g : G **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="186.8516"/>
       <ellipse cx="308" cy="191.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L38" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L38" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="317" y="195.062">h : H ***</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="199.6563"/>
       <ellipse cx="308" cy="204.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L39" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L39" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="317" y="207.8667">i : I *&amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="212.4609"/>
       <ellipse cx="308" cy="217.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L40" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L40" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="317" y="220.6714">j : volatile J *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="303" y="225.2656"/>
       <ellipse cx="308" cy="230.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L41" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00005/t00005.cc#L41" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="317" y="233.4761">k : K *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="298" x2="508" y1="240.0703" y2="240.0703"/>
diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md
index 7711000b..6899b131 100644
--- a/docs/test_cases/t00006.md
+++ b/docs/test_cases/t00006.md
@@ -90,3 +90,671 @@ public:
 ```
 ## Generated UML diagrams
 ![t00006_class](./t00006_class.svg "Class field relationships inferred from templates")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::A",
+      "id": "989095304444672400",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::B",
+      "id": "648285260245005311",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::C",
+      "id": "323304333007297774",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::D",
+      "id": "1006912399043633492",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::E",
+      "id": "1092550394020578978",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 15
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::F",
+      "id": "965398761810782236",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::G",
+      "id": "1764732000887030464",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 19
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::H",
+      "id": "1669285599837552146",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "H",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 21
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::I",
+      "id": "2234750598599000377",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "I",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 23
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::J",
+      "id": "1335933649375465369",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "J",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 25
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::K",
+      "id": "1603190364864080123",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "K",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 27
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::L",
+      "id": "305487238408320046",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "L",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 29
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::M",
+      "id": "1664744512423723275",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "M",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 31
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::N",
+      "id": "950210019792152600",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "N",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 33
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::NN",
+      "id": "1662349735899726224",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "NN",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 35
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::NNN",
+      "id": "1963145075481599858",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "NNN",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 37
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::custom_container<T>",
+      "id": "916380191954937631",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "data",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 41
+          },
+          "type": "std::vector<T>"
+        }
+      ],
+      "methods": [],
+      "name": "custom_container",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 39
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::custom_container<clanguml::t00006::E>",
+      "id": "50153113082434858",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "custom_container",
+      "namespace": "clanguml::t00006",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00006::E"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00006::R",
+      "id": "303025561016882526",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 46
+          },
+          "type": "std::vector<A>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 47
+          },
+          "type": "std::vector<B *>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 49
+          },
+          "type": "std::map<int,C>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "d",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 50
+          },
+          "type": "std::map<int,D *>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 52
+          },
+          "type": "custom_container<clanguml::t00006::E>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 54
+          },
+          "type": "std::vector<std::vector<F>>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "g",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 55
+          },
+          "type": "std::map<int,std::vector<G *>>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "h",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 57
+          },
+          "type": "std::array<H,10>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "i",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 58
+          },
+          "type": "std::array<I *,5>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "j",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 60
+          },
+          "type": "clanguml::t00006::J[10]"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "k",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 61
+          },
+          "type": "clanguml::t00006::K *[20]"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "lm",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 63
+          },
+          "type": "std::vector<std::pair<L,M>>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "ns",
+          "source_location": {
+            "file": "../../tests/t00006/t00006.cc",
+            "line": 65
+          },
+          "type": "std::tuple<N,NN,NNN>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00006",
+      "source_location": {
+        "file": "../../tests/t00006/t00006.cc",
+        "line": 44
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00006_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1092550394020578978",
+      "source": "50153113082434858",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "916380191954937631",
+      "source": "50153113082434858",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "989095304444672400",
+      "label": "a",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "648285260245005311",
+      "label": "b",
+      "source": "303025561016882526",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "323304333007297774",
+      "label": "c",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1006912399043633492",
+      "label": "d",
+      "source": "303025561016882526",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "50153113082434858",
+      "label": "e",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "965398761810782236",
+      "label": "f",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1764732000887030464",
+      "label": "g",
+      "source": "303025561016882526",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1669285599837552146",
+      "label": "h",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "2234750598599000377",
+      "label": "i",
+      "source": "303025561016882526",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1335933649375465369",
+      "label": "j",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1603190364864080123",
+      "label": "k",
+      "source": "303025561016882526",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "305487238408320046",
+      "label": "lm",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1664744512423723275",
+      "label": "lm",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "950210019792152600",
+      "label": "ns",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1662349735899726224",
+      "label": "ns",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1963145075481599858",
+      "label": "ns",
+      "source": "303025561016882526",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00006"
+}
+```
diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg
index 65171aaa..664ab90c 100644
--- a/docs/test_cases/t00006_class.svg
+++ b/docs/test_cases/t00006_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:1390px;height:479px;" version="1.1" viewBox="0 0 1390 479" width="1390px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lhpgti4jf2uo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fc7ddkg763afc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,136 +9,136 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0000989095304444672400" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="299"/>
       <ellipse cx="21" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,320.6406 Q23.3906,320.9375 22.75,321.0781 Q22.1094,321.2344 21.4063,321.2344 Q18.9063,321.2344 17.5781,319.5938 Q16.2656,317.9375 16.2656,314.8125 Q16.2656,311.6875 17.5781,310.0313 Q18.9063,308.375 21.4063,308.375 Q22.1094,308.375 22.75,308.5313 Q23.4063,308.6875 23.9688,308.9844 L23.9688,311.7031 Q23.3438,311.125 22.75,310.8594 Q22.1563,310.5781 21.5313,310.5781 Q20.1875,310.5781 19.5,311.6563 Q18.8125,312.7188 18.8125,314.8125 Q18.8125,316.9063 19.5,317.9844 Q20.1875,319.0469 21.5313,319.0469 Q22.1563,319.0469 22.75,318.7813 Q23.3438,318.5 23.9688,317.9219 L23.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="319.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0000648285260245005311" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="299"/>
       <ellipse cx="96" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,320.6406 Q98.3906,320.9375 97.75,321.0781 Q97.1094,321.2344 96.4063,321.2344 Q93.9063,321.2344 92.5781,319.5938 Q91.2656,317.9375 91.2656,314.8125 Q91.2656,311.6875 92.5781,310.0313 Q93.9063,308.375 96.4063,308.375 Q97.1094,308.375 97.75,308.5313 Q98.4063,308.6875 98.9688,308.9844 L98.9688,311.7031 Q98.3438,311.125 97.75,310.8594 Q97.1563,310.5781 96.5313,310.5781 Q95.1875,310.5781 94.5,311.6563 Q93.8125,312.7188 93.8125,314.8125 Q93.8125,316.9063 94.5,317.9844 Q95.1875,319.0469 96.5313,319.0469 Q97.1563,319.0469 97.75,318.7813 Q98.3438,318.5 98.9688,317.9219 L98.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="319.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0000323304333007297774" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="299"/>
       <ellipse cx="171" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,320.6406 Q173.3906,320.9375 172.75,321.0781 Q172.1094,321.2344 171.4063,321.2344 Q168.9063,321.2344 167.5781,319.5938 Q166.2656,317.9375 166.2656,314.8125 Q166.2656,311.6875 167.5781,310.0313 Q168.9063,308.375 171.4063,308.375 Q172.1094,308.375 172.75,308.5313 Q173.4063,308.6875 173.9688,308.9844 L173.9688,311.7031 Q173.3438,311.125 172.75,310.8594 Q172.1563,310.5781 171.5313,310.5781 Q170.1875,310.5781 169.5,311.6563 Q168.8125,312.7188 168.8125,314.8125 Q168.8125,316.9063 169.5,317.9844 Q170.1875,319.0469 171.5313,319.0469 Q172.1563,319.0469 172.75,318.7813 Q173.3438,318.5 173.9688,317.9219 L173.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="319.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001006912399043633492" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="299"/>
       <ellipse cx="246.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,320.6406 Q248.8906,320.9375 248.25,321.0781 Q247.6094,321.2344 246.9063,321.2344 Q244.4063,321.2344 243.0781,319.5938 Q241.7656,317.9375 241.7656,314.8125 Q241.7656,311.6875 243.0781,310.0313 Q244.4063,308.375 246.9063,308.375 Q247.6094,308.375 248.25,308.5313 Q248.9063,308.6875 249.4688,308.9844 L249.4688,311.7031 Q248.8438,311.125 248.25,310.8594 Q247.6563,310.5781 247.0313,310.5781 Q245.6875,310.5781 245,311.6563 Q244.3125,312.7188 244.3125,314.8125 Q244.3125,316.9063 245,317.9844 Q245.6875,319.0469 247.0313,319.0469 Q247.6563,319.0469 248.25,318.7813 Q248.8438,318.5 249.4688,317.9219 L249.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001092550394020578978" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1146" y="414.5"/>
       <ellipse cx="1161" cy="430.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1163.9688,436.1406 Q1163.3906,436.4375 1162.75,436.5781 Q1162.1094,436.7344 1161.4063,436.7344 Q1158.9063,436.7344 1157.5781,435.0938 Q1156.2656,433.4375 1156.2656,430.3125 Q1156.2656,427.1875 1157.5781,425.5313 Q1158.9063,423.875 1161.4063,423.875 Q1162.1094,423.875 1162.75,424.0313 Q1163.4063,424.1875 1163.9688,424.4844 L1163.9688,427.2031 Q1163.3438,426.625 1162.75,426.3594 Q1162.1563,426.0781 1161.5313,426.0781 Q1160.1875,426.0781 1159.5,427.1563 Q1158.8125,428.2188 1158.8125,430.3125 Q1158.8125,432.4063 1159.5,433.4844 Q1160.1875,434.5469 1161.5313,434.5469 Q1162.1563,434.5469 1162.75,434.2813 Q1163.3438,434 1163.9688,433.4219 L1163.9688,436.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1175" y="434.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="446.5" y2="446.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1147" x2="1185" y1="454.5" y2="454.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L17" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L17" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0000965398761810782236" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="307.5" y="299"/>
       <ellipse cx="322.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.4688,320.6406 Q324.8906,320.9375 324.25,321.0781 Q323.6094,321.2344 322.9063,321.2344 Q320.4063,321.2344 319.0781,319.5938 Q317.7656,317.9375 317.7656,314.8125 Q317.7656,311.6875 319.0781,310.0313 Q320.4063,308.375 322.9063,308.375 Q323.6094,308.375 324.25,308.5313 Q324.9063,308.6875 325.4688,308.9844 L325.4688,311.7031 Q324.8438,311.125 324.25,310.8594 Q323.6563,310.5781 323.0313,310.5781 Q321.6875,310.5781 321,311.6563 Q320.3125,312.7188 320.3125,314.8125 Q320.3125,316.9063 321,317.9844 Q321.6875,319.0469 323.0313,319.0469 Q323.6563,319.0469 324.25,318.7813 Q324.8438,318.5 325.4688,317.9219 L325.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="336.5" y="319.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="345.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L19" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L19" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001764732000887030464" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="381.5" y="299"/>
       <ellipse cx="396.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M399.4688,320.6406 Q398.8906,320.9375 398.25,321.0781 Q397.6094,321.2344 396.9063,321.2344 Q394.4063,321.2344 393.0781,319.5938 Q391.7656,317.9375 391.7656,314.8125 Q391.7656,311.6875 393.0781,310.0313 Q394.4063,308.375 396.9063,308.375 Q397.6094,308.375 398.25,308.5313 Q398.9063,308.6875 399.4688,308.9844 L399.4688,311.7031 Q398.8438,311.125 398.25,310.8594 Q397.6563,310.5781 397.0313,310.5781 Q395.6875,310.5781 395,311.6563 Q394.3125,312.7188 394.3125,314.8125 Q394.3125,316.9063 395,317.9844 Q395.6875,319.0469 397.0313,319.0469 Q397.6563,319.0469 398.25,318.7813 Q398.8438,318.5 399.4688,317.9219 L399.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="410.5" y="319.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="382.5" x2="421.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L21" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L21" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001669285599837552146" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="299"/>
       <ellipse cx="472.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,320.6406 Q474.8906,320.9375 474.25,321.0781 Q473.6094,321.2344 472.9063,321.2344 Q470.4063,321.2344 469.0781,319.5938 Q467.7656,317.9375 467.7656,314.8125 Q467.7656,311.6875 469.0781,310.0313 Q470.4063,308.375 472.9063,308.375 Q473.6094,308.375 474.25,308.5313 Q474.9063,308.6875 475.4688,308.9844 L475.4688,311.7031 Q474.8438,311.125 474.25,310.8594 Q473.6563,310.5781 473.0313,310.5781 Q471.6875,310.5781 471,311.6563 Q470.3125,312.7188 470.3125,314.8125 Q470.3125,316.9063 471,317.9844 Q471.6875,319.0469 473.0313,319.0469 Q473.6563,319.0469 474.25,318.7813 Q474.8438,318.5 475.4688,317.9219 L475.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="319.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L23" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L23" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0002234750598599000377" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="533.5" y="299"/>
       <ellipse cx="548.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,320.6406 Q550.8906,320.9375 550.25,321.0781 Q549.6094,321.2344 548.9063,321.2344 Q546.4063,321.2344 545.0781,319.5938 Q543.7656,317.9375 543.7656,314.8125 Q543.7656,311.6875 545.0781,310.0313 Q546.4063,308.375 548.9063,308.375 Q549.6094,308.375 550.25,308.5313 Q550.9063,308.6875 551.4688,308.9844 L551.4688,311.7031 Q550.8438,311.125 550.25,310.8594 Q549.6563,310.5781 549.0313,310.5781 Q547.6875,310.5781 547,311.6563 Q546.3125,312.7188 546.3125,314.8125 Q546.3125,316.9063 547,317.9844 Q547.6875,319.0469 549.0313,319.0469 Q549.6563,319.0469 550.25,318.7813 Q550.8438,318.5 551.4688,317.9219 L551.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="562.5" y="319.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="567.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L25" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L25" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001335933649375465369" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="603.5" y="299"/>
       <ellipse cx="618.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M621.4688,320.6406 Q620.8906,320.9375 620.25,321.0781 Q619.6094,321.2344 618.9063,321.2344 Q616.4063,321.2344 615.0781,319.5938 Q613.7656,317.9375 613.7656,314.8125 Q613.7656,311.6875 615.0781,310.0313 Q616.4063,308.375 618.9063,308.375 Q619.6094,308.375 620.25,308.5313 Q620.9063,308.6875 621.4688,308.9844 L621.4688,311.7031 Q620.8438,311.125 620.25,310.8594 Q619.6563,310.5781 619.0313,310.5781 Q617.6875,310.5781 617,311.6563 Q616.3125,312.7188 616.3125,314.8125 Q616.3125,316.9063 617,317.9844 Q617.6875,319.0469 619.0313,319.0469 Q619.6563,319.0469 620.25,318.7813 Q620.8438,318.5 621.4688,317.9219 L621.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="632.5" y="319.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="604.5" x2="637.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L27" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L27" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001603190364864080123" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="673.5" y="299"/>
       <ellipse cx="688.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M691.4688,320.6406 Q690.8906,320.9375 690.25,321.0781 Q689.6094,321.2344 688.9063,321.2344 Q686.4063,321.2344 685.0781,319.5938 Q683.7656,317.9375 683.7656,314.8125 Q683.7656,311.6875 685.0781,310.0313 Q686.4063,308.375 688.9063,308.375 Q689.6094,308.375 690.25,308.5313 Q690.9063,308.6875 691.4688,308.9844 L691.4688,311.7031 Q690.8438,311.125 690.25,310.8594 Q689.6563,310.5781 689.0313,310.5781 Q687.6875,310.5781 687,311.6563 Q686.3125,312.7188 686.3125,314.8125 Q686.3125,316.9063 687,317.9844 Q687.6875,319.0469 689.0313,319.0469 Q689.6563,319.0469 690.25,318.7813 Q690.8438,318.5 691.4688,317.9219 L691.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="702.5" y="319.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="674.5" x2="711.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L29" target="_top" title="L" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L29" xlink:show="new" xlink:title="L" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0000305487238408320046" style="stroke: #A80036; stroke-width: 1.5;" width="38" x="748" y="299"/>
       <ellipse cx="763" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M765.9688,320.6406 Q765.3906,320.9375 764.75,321.0781 Q764.1094,321.2344 763.4063,321.2344 Q760.9063,321.2344 759.5781,319.5938 Q758.2656,317.9375 758.2656,314.8125 Q758.2656,311.6875 759.5781,310.0313 Q760.9063,308.375 763.4063,308.375 Q764.1094,308.375 764.75,308.5313 Q765.4063,308.6875 765.9688,308.9844 L765.9688,311.7031 Q765.3438,311.125 764.75,310.8594 Q764.1563,310.5781 763.5313,310.5781 Q762.1875,310.5781 761.5,311.6563 Q760.8125,312.7188 760.8125,314.8125 Q760.8125,316.9063 761.5,317.9844 Q762.1875,319.0469 763.5313,319.0469 Q764.1563,319.0469 764.75,318.7813 Q765.3438,318.5 765.9688,317.9219 L765.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="6" x="777" y="319.1543">L</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="749" x2="785" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L31" target="_top" title="M" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L31" xlink:show="new" xlink:title="M" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001664744512423723275" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="821" y="299"/>
       <ellipse cx="836" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M838.9688,320.6406 Q838.3906,320.9375 837.75,321.0781 Q837.1094,321.2344 836.4063,321.2344 Q833.9063,321.2344 832.5781,319.5938 Q831.2656,317.9375 831.2656,314.8125 Q831.2656,311.6875 832.5781,310.0313 Q833.9063,308.375 836.4063,308.375 Q837.1094,308.375 837.75,308.5313 Q838.4063,308.6875 838.9688,308.9844 L838.9688,311.7031 Q838.3438,311.125 837.75,310.8594 Q837.1563,310.5781 836.5313,310.5781 Q835.1875,310.5781 834.5,311.6563 Q833.8125,312.7188 833.8125,314.8125 Q833.8125,316.9063 834.5,317.9844 Q835.1875,319.0469 836.5313,319.0469 Q837.1563,319.0469 837.75,318.7813 Q838.3438,318.5 838.9688,317.9219 L838.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="10" x="850" y="319.1543">M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="822" x2="862" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L33" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L33" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0000950210019792152600" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="898.5" y="299"/>
       <ellipse cx="913.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M916.4688,320.6406 Q915.8906,320.9375 915.25,321.0781 Q914.6094,321.2344 913.9063,321.2344 Q911.4063,321.2344 910.0781,319.5938 Q908.7656,317.9375 908.7656,314.8125 Q908.7656,311.6875 910.0781,310.0313 Q911.4063,308.375 913.9063,308.375 Q914.6094,308.375 915.25,308.5313 Q915.9063,308.6875 916.4688,308.9844 L916.4688,311.7031 Q915.8438,311.125 915.25,310.8594 Q914.6563,310.5781 914.0313,310.5781 Q912.6875,310.5781 912,311.6563 Q911.3125,312.7188 911.3125,314.8125 Q911.3125,316.9063 912,317.9844 Q912.6875,319.0469 914.0313,319.0469 Q914.6563,319.0469 915.25,318.7813 Q915.8438,318.5 916.4688,317.9219 L916.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="927.5" y="319.1543">N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="899.5" x2="938.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L35" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L35" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001662349735899726224" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="975" y="299"/>
       <ellipse cx="990" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M992.9688,320.6406 Q992.3906,320.9375 991.75,321.0781 Q991.1094,321.2344 990.4063,321.2344 Q987.9063,321.2344 986.5781,319.5938 Q985.2656,317.9375 985.2656,314.8125 Q985.2656,311.6875 986.5781,310.0313 Q987.9063,308.375 990.4063,308.375 Q991.1094,308.375 991.75,308.5313 Q992.4063,308.6875 992.9688,308.9844 L992.9688,311.7031 Q992.3438,311.125 991.75,310.8594 Q991.1563,310.5781 990.5313,310.5781 Q989.1875,310.5781 988.5,311.6563 Q987.8125,312.7188 987.8125,314.8125 Q987.8125,316.9063 988.5,317.9844 Q989.1875,319.0469 990.5313,319.0469 Q991.1563,319.0469 991.75,318.7813 Q992.3438,318.5 992.9688,317.9219 L992.9688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="1004" y="319.1543">NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="976" x2="1024" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L37" target="_top" title="NNN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L37" xlink:show="new" xlink:title="NNN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0001963145075481599858" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="1060.5" y="299"/>
       <ellipse cx="1075.5" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1078.4688,320.6406 Q1077.8906,320.9375 1077.25,321.0781 Q1076.6094,321.2344 1075.9063,321.2344 Q1073.4063,321.2344 1072.0781,319.5938 Q1070.7656,317.9375 1070.7656,314.8125 Q1070.7656,311.6875 1072.0781,310.0313 Q1073.4063,308.375 1075.9063,308.375 Q1076.6094,308.375 1077.25,308.5313 Q1077.9063,308.6875 1078.4688,308.9844 L1078.4688,311.7031 Q1077.8438,311.125 1077.25,310.8594 Q1076.6563,310.5781 1076.0313,310.5781 Q1074.6875,310.5781 1074,311.6563 Q1073.3125,312.7188 1073.3125,314.8125 Q1073.3125,316.9063 1074,317.9844 Q1074.6875,319.0469 1076.0313,319.0469 Q1076.6563,319.0469 1077.25,318.7813 Q1077.8438,318.5 1078.4688,317.9219 L1078.4688,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1089.5" y="319.1543">NNN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="331" y2="331"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1061.5" x2="1118.5" y1="339" y2="339"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L39" target="_top" title="custom_container" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L39" xlink:show="new" xlink:title="custom_container" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="60.8047" id="C_0000916380191954937631" style="stroke: #A80036; stroke-width: 1.5;" width="155" x="1221.5" y="408"/>
       <ellipse cx="1236.5" cy="424" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1239.4688,429.6406 Q1238.8906,429.9375 1238.25,430.0781 Q1237.6094,430.2344 1236.9063,430.2344 Q1234.4063,430.2344 1233.0781,428.5938 Q1231.7656,426.9375 1231.7656,423.8125 Q1231.7656,420.6875 1233.0781,419.0313 Q1234.4063,417.375 1236.9063,417.375 Q1237.6094,417.375 1238.25,417.5313 Q1238.9063,417.6875 1239.4688,417.9844 L1239.4688,420.7031 Q1238.8438,420.125 1238.25,419.8594 Q1237.6563,419.5781 1237.0313,419.5781 Q1235.6875,419.5781 1235,420.6563 Q1234.3125,421.7188 1234.3125,423.8125 Q1234.3125,425.9063 1235,426.9844 Q1235.6875,428.0469 1237.0313,428.0469 Q1237.6563,428.0469 1238.25,427.7813 Q1238.8438,427.5 1239.4688,426.9219 L1239.4688,429.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1250.5" y="428.1543">custom_container</text>
@@ -146,15 +146,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="1371.5" y="417.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="440" y2="440"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1227.5" y="446"/>
       <ellipse cx="1232.5" cy="451" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L41" target="_top" title="data" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L41" xlink:show="new" xlink:title="data" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="123" x="1241.5" y="454.2104">data : std::vector&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1222.5" x2="1375.5" y1="460.8047" y2="460.8047"/>
-    <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
+    <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="48" id="C_0000050153113082434858" style="stroke: #A80036; stroke-width: 1.5;" width="156" x="1155" y="299"/>
     <ellipse cx="1170" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1172.9688,320.6406 Q1172.3906,320.9375 1171.75,321.0781 Q1171.1094,321.2344 1170.4063,321.2344 Q1167.9063,321.2344 1166.5781,319.5938 Q1165.2656,317.9375 1165.2656,314.8125 Q1165.2656,311.6875 1166.5781,310.0313 Q1167.9063,308.375 1170.4063,308.375 Q1171.1094,308.375 1171.75,308.5313 Q1172.4063,308.6875 1172.9688,308.9844 L1172.9688,311.7031 Q1172.3438,311.125 1171.75,310.8594 Q1171.1563,310.5781 1170.5313,310.5781 Q1169.1875,310.5781 1168.5,311.6563 Q1167.8125,312.7188 1167.8125,314.8125 Q1167.8125,316.9063 1168.5,317.9844 Q1169.1875,319.0469 1170.5313,319.0469 Q1171.1563,319.0469 1171.75,318.7813 Q1172.3438,318.5 1172.9688,317.9219 L1172.9688,320.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="112" x="1184" y="319.1543">custom_container</text>
@@ -162,102 +162,102 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="1305" y="308.1387">E</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="331" y2="331"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1156" x2="1310" y1="339" y2="339"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lhpgti4jf2uo)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L44" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L44" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc7ddkg763afc)" height="214.4609" id="C_0000303025561016882526" style="stroke: #A80036; stroke-width: 1.5;" width="230" x="471" y="8"/>
       <ellipse cx="577.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M580.7188,29.6406 Q580.1406,29.9375 579.5,30.0781 Q578.8594,30.2344 578.1563,30.2344 Q575.6563,30.2344 574.3281,28.5938 Q573.0156,26.9375 573.0156,23.8125 Q573.0156,20.6875 574.3281,19.0313 Q575.6563,17.375 578.1563,17.375 Q578.8594,17.375 579.5,17.5313 Q580.1563,17.6875 580.7188,17.9844 L580.7188,20.7031 Q580.0938,20.125 579.5,19.8594 Q578.9063,19.5781 578.2813,19.5781 Q576.9375,19.5781 576.25,20.6563 Q575.5625,21.7188 575.5625,23.8125 Q575.5625,25.9063 576.25,26.9844 Q576.9375,28.0469 578.2813,28.0469 Q578.9063,28.0469 579.5,27.7813 Q580.0938,27.5 580.7188,26.9219 L580.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="598.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="46"/>
       <ellipse cx="482" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L46" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L46" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="491" y="54.2104">a : std::vector&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="58.8047"/>
       <ellipse cx="482" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L47" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L47" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="116" x="491" y="67.0151">b : std::vector&lt;B *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="71.6094"/>
       <ellipse cx="482" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L49" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L49" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="79.8198">c : std::map&lt;int,C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="84.4141"/>
       <ellipse cx="482" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L50" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L50" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="124" x="491" y="92.6245">d : std::map&lt;int,D *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="97.2188"/>
       <ellipse cx="482" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L52" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L52" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="491" y="105.4292">e : custom_container&lt;E&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="110.0234"/>
       <ellipse cx="482" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L54" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L54" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="180" x="491" y="118.2339">f : std::vector&lt;std::vector&lt;F&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="122.8281"/>
       <ellipse cx="482" cy="127.8281" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L55" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L55" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="204" x="491" y="131.0386">g : std::map&lt;int,std::vector&lt;G *&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="135.6328"/>
       <ellipse cx="482" cy="140.6328" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L57" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L57" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="491" y="143.8433">h : std::array&lt;H,10&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="148.4375"/>
       <ellipse cx="482" cy="153.4375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L58" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L58" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="491" y="156.6479">i : std::array&lt;I *,5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="161.2422"/>
       <ellipse cx="482" cy="166.2422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L60" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L60" xlink:show="new" xlink:title="j" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="491" y="169.4526">j : J[10]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="174.0469"/>
       <ellipse cx="482" cy="179.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L61" target="_top" title="k" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L61" xlink:show="new" xlink:title="k" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="491" y="182.2573">k : K *[20]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="186.8516"/>
       <ellipse cx="482" cy="191.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L63" target="_top" title="lm" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L63" xlink:show="new" xlink:title="lm" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="491" y="195.062">lm : std::vector&lt;std::pair&lt;L,M&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="477" y="199.6563"/>
       <ellipse cx="482" cy="204.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L65" target="_top" title="ns" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00006/t00006.cc#L65" xlink:show="new" xlink:title="ns" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="491" y="207.8667">ns : std::tuple&lt;N,NN,NNN&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="472" x2="700" y1="214.4609" y2="214.4609"/>
diff --git a/docs/test_cases/t00007.md b/docs/test_cases/t00007.md
index 2864b1c6..5bbb83a5 100644
--- a/docs/test_cases/t00007.md
+++ b/docs/test_cases/t00007.md
@@ -40,3 +40,147 @@ public:
 ```
 ## Generated UML diagrams
 ![t00007_class](./t00007_class.svg "Smart pointers")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00007::A",
+      "id": "98876622534017019",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00007",
+      "source_location": {
+        "file": "../../tests/t00007/t00007.cc",
+        "line": 5
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00007::B",
+      "id": "696381312773707784",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00007",
+      "source_location": {
+        "file": "../../tests/t00007/t00007.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00007::C",
+      "id": "972031178679364068",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00007",
+      "source_location": {
+        "file": "../../tests/t00007/t00007.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00007::R",
+      "id": "66905874721300157",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00007/t00007.cc",
+            "line": 13
+          },
+          "type": "std::unique_ptr<A>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00007/t00007.cc",
+            "line": 14
+          },
+          "type": "std::shared_ptr<B>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00007/t00007.cc",
+            "line": 15
+          },
+          "type": "std::weak_ptr<C>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00007",
+      "source_location": {
+        "file": "../../tests/t00007/t00007.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00007_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "98876622534017019",
+      "label": "a",
+      "source": "66905874721300157",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "696381312773707784",
+      "label": "b",
+      "source": "66905874721300157",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "972031178679364068",
+      "label": "c",
+      "source": "66905874721300157",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00007"
+}
+```
diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg
index 19d91b9b..bc7b3aca 100644
--- a/docs/test_cases/t00007_class.svg
+++ b/docs/test_cases/t00007_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:207px;height:230px;" version="1.1" viewBox="0 0 207 230" width="207px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1xa5987no9buf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f8ogn3u8zgq5a" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,56 +9,56 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xa5987no9buf)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8ogn3u8zgq5a)" height="48" id="C_0000098876622534017019" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xa5987no9buf)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8ogn3u8zgq5a)" height="48" id="C_0000696381312773707784" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="171"/>
       <ellipse cx="96" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,192.6406 Q98.3906,192.9375 97.75,193.0781 Q97.1094,193.2344 96.4063,193.2344 Q93.9063,193.2344 92.5781,191.5938 Q91.2656,189.9375 91.2656,186.8125 Q91.2656,183.6875 92.5781,182.0313 Q93.9063,180.375 96.4063,180.375 Q97.1094,180.375 97.75,180.5313 Q98.4063,180.6875 98.9688,180.9844 L98.9688,183.7031 Q98.3438,183.125 97.75,182.8594 Q97.1563,182.5781 96.5313,182.5781 Q95.1875,182.5781 94.5,183.6563 Q93.8125,184.7188 93.8125,186.8125 Q93.8125,188.9063 94.5,189.9844 Q95.1875,191.0469 96.5313,191.0469 Q97.1563,191.0469 97.75,190.7813 Q98.3438,190.5 98.9688,189.9219 L98.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="191.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xa5987no9buf)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8ogn3u8zgq5a)" height="48" id="C_0000972031178679364068" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="171"/>
       <ellipse cx="171" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,192.6406 Q173.3906,192.9375 172.75,193.0781 Q172.1094,193.2344 171.4063,193.2344 Q168.9063,193.2344 167.5781,191.5938 Q166.2656,189.9375 166.2656,186.8125 Q166.2656,183.6875 167.5781,182.0313 Q168.9063,180.375 171.4063,180.375 Q172.1094,180.375 172.75,180.5313 Q173.4063,180.6875 173.9688,180.9844 L173.9688,183.7031 Q173.3438,183.125 172.75,182.8594 Q172.1563,182.5781 171.5313,182.5781 Q170.1875,182.5781 169.5,183.6563 Q168.8125,184.7188 168.8125,186.8125 Q168.8125,188.9063 169.5,189.9844 Q170.1875,191.0469 171.5313,191.0469 Q172.1563,191.0469 172.75,190.7813 Q173.3438,190.5 173.9688,189.9219 L173.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="191.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xa5987no9buf)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L11" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L11" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8ogn3u8zgq5a)" height="86.4141" id="C_0000066905874721300157" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="21.5" y="8"/>
       <ellipse cx="92.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M95.7188,29.6406 Q95.1406,29.9375 94.5,30.0781 Q93.8594,30.2344 93.1563,30.2344 Q90.6563,30.2344 89.3281,28.5938 Q88.0156,26.9375 88.0156,23.8125 Q88.0156,20.6875 89.3281,19.0313 Q90.6563,17.375 93.1563,17.375 Q93.8594,17.375 94.5,17.5313 Q95.1563,17.6875 95.7188,17.9844 L95.7188,20.7031 Q95.0938,20.125 94.5,19.8594 Q93.9063,19.5781 93.2813,19.5781 Q91.9375,19.5781 91.25,20.6563 Q90.5625,21.7188 90.5625,23.8125 Q90.5625,25.9063 91.25,26.9844 Q91.9375,28.0469 93.2813,28.0469 Q93.9063,28.0469 94.5,27.7813 Q95.0938,27.5 95.7188,26.9219 L95.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="46"/>
       <ellipse cx="32.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L13" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L13" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="130" x="41.5" y="54.2104">a : std::unique_ptr&lt;A&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="58.8047"/>
       <ellipse cx="32.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="41.5" y="67.0151">b : std::shared_ptr&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="27.5" y="71.6094"/>
       <ellipse cx="32.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00007/t00007.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="41.5" y="79.8198">c : std::weak_ptr&lt;C&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22.5" x2="179.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md
index 078627e1..27f8892f 100644
--- a/docs/test_cases/t00008.md
+++ b/docs/test_cases/t00008.md
@@ -73,3 +73,425 @@ template <> struct E::nested_template<char> {
 ```
 ## Generated UML diagrams
 ![t00008_class](./t00008_class.svg "Template and template template relationships")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00008::A<T,P=T,clanguml::t00008::CMP=nullptr,int N=3>",
+      "id": "1657660300852090121",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "value",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 11
+          },
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "pointer",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 12
+          },
+          "type": "T *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "reference",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 13
+          },
+          "type": "T &"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "values",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 14
+          },
+          "type": "std::vector<P>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "ints",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 15
+          },
+          "type": "std::array<int,N>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "comparator",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 17
+          },
+          "type": "clanguml::t00008::CMP"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00008",
+      "source_location": {
+        "file": "../../tests/t00008/t00008.cc",
+        "line": 9
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "default": "T",
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "P",
+          "template_parameters": []
+        },
+        {
+          "default": "nullptr",
+          "is_variadic": false,
+          "kind": "non_type_template",
+          "template_parameters": [],
+          "type": "clanguml::t00008::CMP"
+        },
+        {
+          "default": "3",
+          "is_variadic": false,
+          "kind": "non_type_template",
+          "name": "N",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00008::Vector<T>",
+      "id": "1677407014842680311",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "values",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 21
+          },
+          "type": "std::vector<T>"
+        }
+      ],
+      "methods": [],
+      "name": "Vector",
+      "namespace": "clanguml::t00008",
+      "source_location": {
+        "file": "../../tests/t00008/t00008.cc",
+        "line": 20
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00008::B<T,C<>>",
+      "id": "1968575752686868237",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "template_template",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 25
+          },
+          "type": "C<T>"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00008",
+      "source_location": {
+        "file": "../../tests/t00008/t00008.cc",
+        "line": 24
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_template_type",
+          "name": "C<>",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00008::B<int,clanguml::t00008::Vector>",
+      "id": "1449136415707203971",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00008",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "clanguml::t00008::Vector",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00008::D",
+      "id": "1562396858816419857",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "ints",
+          "source_location": {
+            "file": "../../tests/t00008/t00008.cc",
+            "line": 29
+          },
+          "type": "B<int,clanguml::t00008::Vector>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "add",
+          "parameters": [
+            {
+              "name": "i",
+              "type": "int"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "D",
+          "parameters": [
+            {
+              "name": "",
+              "type": "std::tuple<Items...> *"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "D",
+      "namespace": "clanguml::t00008",
+      "source_location": {
+        "file": "../../tests/t00008/t00008.cc",
+        "line": 28
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00008::E",
+      "id": "1787658457052431115",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00008",
+      "source_location": {
+        "file": "../../tests/t00008/t00008.cc",
+        "line": 36
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00008::E::nested_template<ET>",
+      "id": "1549419203490064906",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": true,
+          "is_virtual": false,
+          "name": "get",
+          "parameters": [
+            {
+              "name": "d",
+              "type": "ET *"
+            }
+          ],
+          "type": "clanguml::t00008::E::nested_template::DT *"
+        }
+      ],
+      "name": "E::nested_template",
+      "namespace": "clanguml::t00008",
+      "source_location": {
+        "file": "../../tests/t00008/t00008.cc",
+        "line": 37
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "ET",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00008::E::nested_template<char>",
+      "id": "33637089897037832",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E::nested_template",
+      "namespace": "clanguml::t00008",
+      "source_location": {
+        "file": "../../tests/t00008/t00008.cc",
+        "line": 44
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "char"
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00008_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1968575752686868237",
+      "source": "1449136415707203971",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1449136415707203971",
+      "label": "ints",
+      "source": "1562396858816419857",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1787658457052431115",
+      "source": "1549419203490064906",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "1787658457052431115",
+      "source": "33637089897037832",
+      "type": "containment"
+    },
+    {
+      "access": "public",
+      "destination": "1549419203490064906",
+      "source": "33637089897037832",
+      "type": "instantiation"
+    }
+  ],
+  "using_namespace": "clanguml::t00008"
+}
+```
diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg
index 3056b44d..a185794a 100644
--- a/docs/test_cases/t00008_class.svg
+++ b/docs/test_cases/t00008_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="403px" preserveAspectRatio="none" style="width:1102px;height:403px;" version="1.1" viewBox="0 0 1102 403" width="1102px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnuhfjbtvghee" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1duj3peuzeugu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnuhfjbtvghee)" height="124.8281" id="C_0001657660300852090121" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1duj3peuzeugu)" height="124.8281" id="C_0001657660300852090121" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
@@ -18,51 +18,51 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="165" x="52" y="17.1387">T,P=T,CMP=nullptr,int N=3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="54.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <ellipse cx="17" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L12" target="_top" title="pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L12" xlink:show="new" xlink:title="pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="69" x="26" y="67.0151">pointer : T *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="71.6094"/>
       <ellipse cx="17" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L13" target="_top" title="reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L13" xlink:show="new" xlink:title="reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="88" x="26" y="79.8198">reference : T &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="84.4141"/>
       <ellipse cx="17" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L14" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L14" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="26" y="92.6245">values : std::vector&lt;P&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="97.2188"/>
       <ellipse cx="17" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L15" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L15" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="133" x="26" y="105.4292">ints : std::array&lt;int,N&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="110.0234"/>
       <ellipse cx="17" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L17" target="_top" title="comparator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L17" xlink:show="new" xlink:title="comparator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="118.2339">comparator : CMP</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="214" y1="124.8281" y2="124.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnuhfjbtvghee)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="250" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L20" target="_top" title="Vector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L20" xlink:show="new" xlink:title="Vector" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1duj3peuzeugu)" height="60.8047" id="C_0001677407014842680311" style="stroke: #A80036; stroke-width: 1.5;" width="161" x="250" y="40"/>
       <ellipse cx="300.25" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M303.2188,61.6406 Q302.6406,61.9375 302,62.0781 Q301.3594,62.2344 300.6563,62.2344 Q298.1563,62.2344 296.8281,60.5938 Q295.5156,58.9375 295.5156,55.8125 Q295.5156,52.6875 296.8281,51.0313 Q298.1563,49.375 300.6563,49.375 Q301.3594,49.375 302,49.5313 Q302.6563,49.6875 303.2188,49.9844 L303.2188,52.7031 Q302.5938,52.125 302,51.8594 Q301.4063,51.5781 300.7813,51.5781 Q299.4375,51.5781 298.75,52.6563 Q298.0625,53.7188 298.0625,55.8125 Q298.0625,57.9063 298.75,58.9844 Q299.4375,60.0469 300.7813,60.0469 Q301.4063,60.0469 302,59.7813 Q302.5938,59.5 303.2188,58.9219 L303.2188,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="320.75" y="60.1543">Vector</text>
@@ -70,16 +70,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="406" y="49.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="72" y2="72"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="78"/>
       <ellipse cx="261" cy="83" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L21" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L21" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="270" y="86.2104">values : std::vector&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="410" y1="92.8047" y2="92.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnuhfjbtvghee)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="492" y="332"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1duj3peuzeugu)" height="60.8047" id="C_0001968575752686868237" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="492" y="332"/>
       <ellipse cx="550.75" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M553.7188,353.6406 Q553.1406,353.9375 552.5,354.0781 Q551.8594,354.2344 551.1563,354.2344 Q548.6563,354.2344 547.3281,352.5938 Q546.0156,350.9375 546.0156,347.8125 Q546.0156,344.6875 547.3281,343.0313 Q548.6563,341.375 551.1563,341.375 Q551.8594,341.375 552.5,341.5313 Q553.1563,341.6875 553.7188,341.9844 L553.7188,344.7031 Q553.0938,344.125 552.5,343.8594 Q551.9063,343.5781 551.2813,343.5781 Q549.9375,343.5781 549.25,344.6563 Q548.5625,345.7188 548.5625,347.8125 Q548.5625,349.9063 549.25,350.9844 Q549.9375,352.0469 551.2813,352.0469 Q551.9063,352.0469 552.5,351.7813 Q553.0938,351.5 553.7188,350.9219 L553.7188,353.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="571.25" y="352.1543">B</text>
@@ -87,15 +87,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="39" x="632" y="341.1387">T,C&lt;&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="493" x2="668" y1="364" y2="364"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="498" y="370"/>
       <ellipse cx="503" cy="375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L25" target="_top" title="template_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L25" xlink:show="new" xlink:title="template_template" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="512" y="378.2104">template_template : C&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="493" x2="668" y1="384.8047" y2="384.8047"/>
-    <rect fill="#FEFECE" filter="url(#fnuhfjbtvghee)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="528" y="216.5"/>
+    <rect fill="#FEFECE" filter="url(#f1duj3peuzeugu)" height="48" id="C_0001449136415707203971" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="528" y="216.5"/>
     <ellipse cx="543" cy="232.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M545.9688,238.1406 Q545.3906,238.4375 544.75,238.5781 Q544.1094,238.7344 543.4063,238.7344 Q540.9063,238.7344 539.5781,237.0938 Q538.2656,235.4375 538.2656,232.3125 Q538.2656,229.1875 539.5781,227.5313 Q540.9063,225.875 543.4063,225.875 Q544.1094,225.875 544.75,226.0313 Q545.4063,226.1875 545.9688,226.4844 L545.9688,229.2031 Q545.3438,228.625 544.75,228.3594 Q544.1563,228.0781 543.5313,228.0781 Q542.1875,228.0781 541.5,229.1563 Q540.8125,230.2188 540.8125,232.3125 Q540.8125,234.4063 541.5,235.4844 Q542.1875,236.5469 543.5313,236.5469 Q544.1563,236.5469 544.75,236.2813 Q545.3438,236 545.9688,235.4219 L545.9688,238.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="557" y="236.6543">B</text>
@@ -103,18 +103,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="574" y="225.6387">int,Vector</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="529" x2="632" y1="248.5" y2="248.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="529" x2="632" y1="256.5" y2="256.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnuhfjbtvghee)" height="86.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="269" x="446" y="27.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1duj3peuzeugu)" height="86.4141" id="C_0001562396858816419857" style="stroke: #A80036; stroke-width: 1.5;" width="269" x="446" y="27.5"/>
       <ellipse cx="571.75" cy="43.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M574.7188,49.1406 Q574.1406,49.4375 573.5,49.5781 Q572.8594,49.7344 572.1563,49.7344 Q569.6563,49.7344 568.3281,48.0938 Q567.0156,46.4375 567.0156,43.3125 Q567.0156,40.1875 568.3281,38.5313 Q569.6563,36.875 572.1563,36.875 Q572.8594,36.875 573.5,37.0313 Q574.1563,37.1875 574.7188,37.4844 L574.7188,40.2031 Q574.0938,39.625 573.5,39.3594 Q572.9063,39.0781 572.2813,39.0781 Q570.9375,39.0781 570.25,40.1563 Q569.5625,41.2188 569.5625,43.3125 Q569.5625,45.4063 570.25,46.4844 Q570.9375,47.5469 572.2813,47.5469 Q572.9063,47.5469 573.5,47.2813 Q574.0938,47 574.7188,46.4219 L574.7188,49.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="592.25" y="47.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="714" y1="59.5" y2="59.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="452" y="65.5"/>
       <ellipse cx="457" cy="70.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L29" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L29" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="113" x="466" y="73.7104">ints : B&lt;int,Vector&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="447" x2="714" y1="80.3047" y2="80.3047"/>
@@ -122,16 +122,16 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="85" x="466" y="94.5151">add(int i) : void</text>
     <ellipse cx="457" cy="104.1094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="243" x="466" y="107.3198">D&lt;Items...&gt;(std::tuple&lt;Items...&gt; * ) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnuhfjbtvghee)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="827.5" y="338.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L36" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L36" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1duj3peuzeugu)" height="48" id="C_0001787658457052431115" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="827.5" y="338.5"/>
       <ellipse cx="842.5" cy="354.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M845.4688,360.1406 Q844.8906,360.4375 844.25,360.5781 Q843.6094,360.7344 842.9063,360.7344 Q840.4063,360.7344 839.0781,359.0938 Q837.7656,357.4375 837.7656,354.3125 Q837.7656,351.1875 839.0781,349.5313 Q840.4063,347.875 842.9063,347.875 Q843.6094,347.875 844.25,348.0313 Q844.9063,348.1875 845.4688,348.4844 L845.4688,351.2031 Q844.8438,350.625 844.25,350.3594 Q843.6563,350.0781 843.0313,350.0781 Q841.6875,350.0781 841,351.1563 Q840.3125,352.2188 840.3125,354.3125 Q840.3125,356.4063 841,357.4844 Q841.6875,358.5469 843.0313,358.5469 Q843.6563,358.5469 844.25,358.2813 Q844.8438,358 845.4688,357.4219 L845.4688,360.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="856.5" y="358.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="828.5" x2="866.5" y1="370.5" y2="370.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="828.5" x2="866.5" y1="378.5" y2="378.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnuhfjbtvghee)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="846.5" y="210"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L37" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L37" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1duj3peuzeugu)" height="60.8047" id="C_0001549419203490064906" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="846.5" y="210"/>
       <ellipse cx="892.75" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M895.7188,231.6406 Q895.1406,231.9375 894.5,232.0781 Q893.8594,232.2344 893.1563,232.2344 Q890.6563,232.2344 889.3281,230.5938 Q888.0156,228.9375 888.0156,225.8125 Q888.0156,222.6875 889.3281,221.0313 Q890.6563,219.375 893.1563,219.375 Q893.8594,219.375 894.5,219.5313 Q895.1563,219.6875 895.7188,219.9844 L895.7188,222.7031 Q895.0938,222.125 894.5,221.8594 Q893.9063,221.5781 893.2813,221.5781 Q891.9375,221.5781 891.25,222.6563 Q890.5625,223.7188 890.5625,225.8125 Q890.5625,227.9063 891.25,228.9844 Q891.9375,230.0469 893.2813,230.0469 Q893.9063,230.0469 894.5,229.7813 Q895.0938,229.5 895.7188,228.9219 L895.7188,231.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="913.25" y="230.1543">E::nested_template</text>
@@ -142,8 +142,8 @@
       <ellipse cx="857.5" cy="261" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="216" x="866.5" y="264.2104">get(ET * d) : E::nested_template::DT *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnuhfjbtvghee)" height="48" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="750.5" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L44" target="_top" title="E##nested_template" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00008/t00008.cc#L44" xlink:show="new" xlink:title="E##nested_template" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1duj3peuzeugu)" height="48" id="C_0000033637089897037832" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="750.5" y="46.5"/>
       <ellipse cx="765.5" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M768.4688,68.1406 Q767.8906,68.4375 767.25,68.5781 Q766.6094,68.7344 765.9063,68.7344 Q763.4063,68.7344 762.0781,67.0938 Q760.7656,65.4375 760.7656,62.3125 Q760.7656,59.1875 762.0781,57.5313 Q763.4063,55.875 765.9063,55.875 Q766.6094,55.875 767.25,56.0313 Q767.9063,56.1875 768.4688,56.4844 L768.4688,59.2031 Q767.8438,58.625 767.25,58.3594 Q766.6563,58.0781 766.0313,58.0781 Q764.6875,58.0781 764,59.1563 Q763.3125,60.2188 763.3125,62.3125 Q763.3125,64.4063 764,65.4844 Q764.6875,66.5469 766.0313,66.5469 Q766.6563,66.5469 767.25,66.2813 Q767.8438,66 768.4688,65.4219 L768.4688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="122" x="779.5" y="66.6543">E::nested_template</text>
diff --git a/docs/test_cases/t00009.md b/docs/test_cases/t00009.md
index 6b372686..559635b3 100644
--- a/docs/test_cases/t00009.md
+++ b/docs/test_cases/t00009.md
@@ -41,3 +41,219 @@ public:
 ```
 ## Generated UML diagrams
 ![t00009_class](./t00009_class.svg "Template instantiation")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00009::A<T>",
+      "id": "412228989111660105",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "value",
+          "source_location": {
+            "file": "../../tests/t00009/t00009.cc",
+            "line": 9
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00009",
+      "source_location": {
+        "file": "../../tests/t00009/t00009.cc",
+        "line": 7
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00009::A<int>",
+      "id": "1894387438043499",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00009",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00009::A<std::string>",
+      "id": "1340793233843139195",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00009",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00009::A<std::vector<std::string>>",
+      "id": "1370808797762248850",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00009",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "std::string"
+            }
+          ],
+          "type": "std::vector"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00009::B",
+      "id": "176239714450247310",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "aint",
+          "source_location": {
+            "file": "../../tests/t00009/t00009.cc",
+            "line": 14
+          },
+          "type": "A<int>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "astring",
+          "source_location": {
+            "file": "../../tests/t00009/t00009.cc",
+            "line": 15
+          },
+          "type": "A<std::string> *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "avector",
+          "source_location": {
+            "file": "../../tests/t00009/t00009.cc",
+            "line": 16
+          },
+          "type": "A<std::vector<std::string>> &"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00009",
+      "source_location": {
+        "file": "../../tests/t00009/t00009.cc",
+        "line": 12
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00009_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "412228989111660105",
+      "source": "1894387438043499",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "412228989111660105",
+      "source": "1340793233843139195",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "412228989111660105",
+      "source": "1370808797762248850",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1894387438043499",
+      "label": "aint",
+      "source": "176239714450247310",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1340793233843139195",
+      "label": "astring",
+      "source": "176239714450247310",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1370808797762248850",
+      "label": "avector",
+      "source": "176239714450247310",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00009"
+}
+```
diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg
index 21629ef9..58f0d7a1 100644
--- a/docs/test_cases/t00009_class.svg
+++ b/docs/test_cases/t00009_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="351px" preserveAspectRatio="none" style="width:448px;height:351px;" version="1.1" viewBox="0 0 448 351" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fahdaz32aa4fu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzq9c7wpvh2p2" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fahdaz32aa4fu)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzq9c7wpvh2p2)" height="60.8047" id="C_0000412228989111660105" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="116.5" y="280"/>
       <ellipse cx="142.3" cy="296" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.2688,301.6406 Q144.6906,301.9375 144.05,302.0781 Q143.4094,302.2344 142.7063,302.2344 Q140.2063,302.2344 138.8781,300.5938 Q137.5656,298.9375 137.5656,295.8125 Q137.5656,292.6875 138.8781,291.0313 Q140.2063,289.375 142.7063,289.375 Q143.4094,289.375 144.05,289.5313 Q144.7063,289.6875 145.2688,289.9844 L145.2688,292.7031 Q144.6438,292.125 144.05,291.8594 Q143.4563,291.5781 142.8313,291.5781 Q141.4875,291.5781 140.8,292.6563 Q140.1125,293.7188 140.1125,295.8125 Q140.1125,297.9063 140.8,298.9844 Q141.4875,300.0469 142.8313,300.0469 Q143.4563,300.0469 144.05,299.7813 Q144.6438,299.5 145.2688,298.9219 L145.2688,301.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="158.7" y="300.1543">A</text>
@@ -18,15 +18,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="186.5" y="289.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="312" y2="312"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122.5" y="318"/>
       <ellipse cx="127.5" cy="323" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L9" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L9" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="136.5" y="326.2104">value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117.5" x2="190.5" y1="332.8047" y2="332.8047"/>
-    <rect fill="#FEFECE" filter="url(#fahdaz32aa4fu)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
+    <rect fill="#FEFECE" filter="url(#fzq9c7wpvh2p2)" height="48" id="C_0000001894387438043499" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="6" y="171"/>
     <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="191.1543">A</text>
@@ -34,7 +34,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="52" y="180.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="65" y1="211" y2="211"/>
-    <rect fill="#FEFECE" filter="url(#fahdaz32aa4fu)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
+    <rect fill="#FEFECE" filter="url(#fzq9c7wpvh2p2)" height="48" id="C_0001340793233843139195" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="101" y="171"/>
     <ellipse cx="116" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M118.9688,192.6406 Q118.3906,192.9375 117.75,193.0781 Q117.1094,193.2344 116.4063,193.2344 Q113.9063,193.2344 112.5781,191.5938 Q111.2656,189.9375 111.2656,186.8125 Q111.2656,183.6875 112.5781,182.0313 Q113.9063,180.375 116.4063,180.375 Q117.1094,180.375 117.75,180.5313 Q118.4063,180.6875 118.9688,180.9844 L118.9688,183.7031 Q118.3438,183.125 117.75,182.8594 Q117.1563,182.5781 116.5313,182.5781 Q115.1875,182.5781 114.5,183.6563 Q113.8125,184.7188 113.8125,186.8125 Q113.8125,188.9063 114.5,189.9844 Q115.1875,191.0469 116.5313,191.0469 Q117.1563,191.0469 117.75,190.7813 Q118.3438,190.5 118.9688,189.9219 L118.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="130" y="191.1543">A</text>
@@ -42,7 +42,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="147" y="180.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="102" x2="206" y1="211" y2="211"/>
-    <rect fill="#FEFECE" filter="url(#fahdaz32aa4fu)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
+    <rect fill="#FEFECE" filter="url(#fzq9c7wpvh2p2)" height="48" id="C_0001370808797762248850" style="stroke: #A80036; stroke-width: 1.5;" width="192" x="242" y="171"/>
     <ellipse cx="257" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M259.9688,192.6406 Q259.3906,192.9375 258.75,193.0781 Q258.1094,193.2344 257.4063,193.2344 Q254.9063,193.2344 253.5781,191.5938 Q252.2656,189.9375 252.2656,186.8125 Q252.2656,183.6875 253.5781,182.0313 Q254.9063,180.375 257.4063,180.375 Q258.1094,180.375 258.75,180.5313 Q259.4063,180.6875 259.9688,180.9844 L259.9688,183.7031 Q259.3438,183.125 258.75,182.8594 Q258.1563,182.5781 257.5313,182.5781 Q256.1875,182.5781 255.5,183.6563 Q254.8125,184.7188 254.8125,186.8125 Q254.8125,188.9063 255.5,189.9844 Q256.1875,191.0469 257.5313,191.0469 Q258.1563,191.0469 258.75,190.7813 Q259.3438,190.5 259.9688,189.9219 L259.9688,192.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="271" y="191.1543">A</text>
@@ -50,32 +50,32 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="148" x="288" y="180.1387">std::vector&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="203" y2="203"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="243" x2="433" y1="211" y2="211"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fahdaz32aa4fu)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzq9c7wpvh2p2)" height="86.4141" id="C_0000176239714450247310" style="stroke: #A80036; stroke-width: 1.5;" width="257" x="25.5" y="8"/>
       <ellipse cx="145.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.7188,29.6406 Q148.1406,29.9375 147.5,30.0781 Q146.8594,30.2344 146.1563,30.2344 Q143.6563,30.2344 142.3281,28.5938 Q141.0156,26.9375 141.0156,23.8125 Q141.0156,20.6875 142.3281,19.0313 Q143.6563,17.375 146.1563,17.375 Q146.8594,17.375 147.5,17.5313 Q148.1563,17.6875 148.7188,17.9844 L148.7188,20.7031 Q148.0938,20.125 147.5,19.8594 Q146.9063,19.5781 146.2813,19.5781 Q144.9375,19.5781 144.25,20.6563 Q143.5625,21.7188 143.5625,23.8125 Q143.5625,25.9063 144.25,26.9844 Q144.9375,28.0469 146.2813,28.0469 Q146.9063,28.0469 147.5,27.7813 Q148.0938,27.5 148.7188,26.9219 L148.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="166.25" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="46"/>
       <ellipse cx="36.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L14" target="_top" title="aint" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L14" xlink:show="new" xlink:title="aint" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="45.5" y="54.2104">aint : A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="58.8047"/>
       <ellipse cx="36.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="45.5" y="67.0151">astring : A&lt;std::string&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="31.5" y="71.6094"/>
       <ellipse cx="36.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L16" target="_top" title="avector" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00009/t00009.cc#L16" xlink:show="new" xlink:title="avector" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="231" x="45.5" y="79.8198">avector : A&lt;std::vector&lt;std::string&gt;&gt; &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="26.5" x2="281.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00010.md b/docs/test_cases/t00010.md
index 1f8d9377..259e2445 100644
--- a/docs/test_cases/t00010.md
+++ b/docs/test_cases/t00010.md
@@ -45,3 +45,216 @@ public:
 ```
 ## Generated UML diagrams
 ![t00010_class](./t00010_class.svg "Basic template instantiation")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00010::A<T,P>",
+      "id": "2222216618904514099",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "first",
+          "source_location": {
+            "file": "../../tests/t00010/t00010.cc",
+            "line": 9
+          },
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "second",
+          "source_location": {
+            "file": "../../tests/t00010/t00010.cc",
+            "line": 10
+          },
+          "type": "P"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00010",
+      "source_location": {
+        "file": "../../tests/t00010/t00010.cc",
+        "line": 7
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "P",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00010::A<T,std::string>",
+      "id": "1861520693741915300",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00010",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "T"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00010::B<T>",
+      "id": "2303611426082708583",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "astring",
+          "source_location": {
+            "file": "../../tests/t00010/t00010.cc",
+            "line": 15
+          },
+          "type": "A<T,std::string>"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00010",
+      "source_location": {
+        "file": "../../tests/t00010/t00010.cc",
+        "line": 13
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00010::B<int>",
+      "id": "1498376939480949099",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00010",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00010::C",
+      "id": "1880966578968892571",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "aintstring",
+          "source_location": {
+            "file": "../../tests/t00010/t00010.cc",
+            "line": 20
+          },
+          "type": "B<int>"
+        }
+      ],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00010",
+      "source_location": {
+        "file": "../../tests/t00010/t00010.cc",
+        "line": 18
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00010_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2222216618904514099",
+      "source": "1861520693741915300",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1861520693741915300",
+      "label": "astring",
+      "source": "2303611426082708583",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "2303611426082708583",
+      "source": "1498376939480949099",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1498376939480949099",
+      "label": "aintstring",
+      "source": "1880966578968892571",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00010"
+}
+```
diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg
index df030bc2..47e73499 100644
--- a/docs/test_cases/t00010_class.svg
+++ b/docs/test_cases/t00010_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="586px" preserveAspectRatio="none" style="width:193px;height:586px;" version="1.1" viewBox="0 0 193 586" width="193px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fzh93lh5antst" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fyp0w8cctwro4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzh93lh5antst)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyp0w8cctwro4)" height="73.6094" id="C_0002222216618904514099" style="stroke: #A80036; stroke-width: 1.5;" width="86" x="49.5" y="502"/>
       <ellipse cx="75.3" cy="518" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M78.2688,523.6406 Q77.6906,523.9375 77.05,524.0781 Q76.4094,524.2344 75.7063,524.2344 Q73.2063,524.2344 71.8781,522.5938 Q70.5656,520.9375 70.5656,517.8125 Q70.5656,514.6875 71.8781,513.0313 Q73.2063,511.375 75.7063,511.375 Q76.4094,511.375 77.05,511.5313 Q77.7063,511.6875 78.2688,511.9844 L78.2688,514.7031 Q77.6438,514.125 77.05,513.8594 Q76.4563,513.5781 75.8313,513.5781 Q74.4875,513.5781 73.8,514.6563 Q73.1125,515.7188 73.1125,517.8125 Q73.1125,519.9063 73.8,520.9844 Q74.4875,522.0469 75.8313,522.0469 Q76.4563,522.0469 77.05,521.7813 Q77.6438,521.5 78.2688,520.9219 L78.2688,523.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.7" y="522.1543">A</text>
@@ -18,22 +18,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="119.5" y="511.1387">T,P</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="534" y2="534"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="540"/>
       <ellipse cx="60.5" cy="545" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L9" target="_top" title="first" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L9" xlink:show="new" xlink:title="first" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="69.5" y="548.2104">first : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55.5" y="552.8047"/>
       <ellipse cx="60.5" cy="557.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L10" target="_top" title="second" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L10" xlink:show="new" xlink:title="second" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="69.5" y="561.0151">second : P</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="50.5" x2="134.5" y1="567.6094" y2="567.6094"/>
-    <rect fill="#FEFECE" filter="url(#fzh93lh5antst)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
+    <rect fill="#FEFECE" filter="url(#fyp0w8cctwro4)" height="48" id="C_0001861520693741915300" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="34" y="393"/>
     <ellipse cx="49" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M51.9688,414.6406 Q51.3906,414.9375 50.75,415.0781 Q50.1094,415.2344 49.4063,415.2344 Q46.9063,415.2344 45.5781,413.5938 Q44.2656,411.9375 44.2656,408.8125 Q44.2656,405.6875 45.5781,404.0313 Q46.9063,402.375 49.4063,402.375 Q50.1094,402.375 50.75,402.5313 Q51.4063,402.6875 51.9688,402.9844 L51.9688,405.7031 Q51.3438,405.125 50.75,404.8594 Q50.1563,404.5781 49.5313,404.5781 Q48.1875,404.5781 47.5,405.6563 Q46.8125,406.7188 46.8125,408.8125 Q46.8125,410.9063 47.5,411.9844 Q48.1875,413.0469 49.5313,413.0469 Q50.1563,413.0469 50.75,412.7813 Q51.3438,412.5 51.9688,411.9219 L51.9688,414.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="63" y="413.1543">A</text>
@@ -41,8 +41,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="80" y="402.1387">T,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="425" y2="425"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="35" x2="150" y1="433" y2="433"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzh93lh5antst)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyp0w8cctwro4)" height="60.8047" id="C_0002303611426082708583" style="stroke: #A80036; stroke-width: 1.5;" width="173" x="6" y="255"/>
       <ellipse cx="78.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M81.7188,276.6406 Q81.1406,276.9375 80.5,277.0781 Q79.8594,277.2344 79.1563,277.2344 Q76.6563,277.2344 75.3281,275.5938 Q74.0156,273.9375 74.0156,270.8125 Q74.0156,267.6875 75.3281,266.0313 Q76.6563,264.375 79.1563,264.375 Q79.8594,264.375 80.5,264.5313 Q81.1563,264.6875 81.7188,264.9844 L81.7188,267.7031 Q81.0938,267.125 80.5,266.8594 Q79.9063,266.5781 79.2813,266.5781 Q77.9375,266.5781 77.25,267.6563 Q76.5625,268.7188 76.5625,270.8125 Q76.5625,272.9063 77.25,273.9844 Q77.9375,275.0469 79.2813,275.0469 Q79.9063,275.0469 80.5,274.7813 Q81.0938,274.5 81.7188,273.9219 L81.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="99.25" y="275.1543">B</text>
@@ -50,15 +50,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="174" y="264.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
       <ellipse cx="17" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L15" target="_top" title="astring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L15" xlink:show="new" xlink:title="astring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="26" y="301.2104">astring : A&lt;T,std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="178" y1="307.8047" y2="307.8047"/>
-    <rect fill="#FEFECE" filter="url(#fzh93lh5antst)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
+    <rect fill="#FEFECE" filter="url(#fyp0w8cctwro4)" height="48" id="C_0001498376939480949099" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="62.5" y="146"/>
     <ellipse cx="77.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M80.4688,167.6406 Q79.8906,167.9375 79.25,168.0781 Q78.6094,168.2344 77.9063,168.2344 Q75.4063,168.2344 74.0781,166.5938 Q72.7656,164.9375 72.7656,161.8125 Q72.7656,158.6875 74.0781,157.0313 Q75.4063,155.375 77.9063,155.375 Q78.6094,155.375 79.25,155.5313 Q79.9063,155.6875 80.4688,155.9844 L80.4688,158.7031 Q79.8438,158.125 79.25,157.8594 Q78.6563,157.5781 78.0313,157.5781 Q76.6875,157.5781 76,158.6563 Q75.3125,159.7188 75.3125,161.8125 Q75.3125,163.9063 76,164.9844 Q76.6875,166.0469 78.0313,166.0469 Q78.6563,166.0469 79.25,165.7813 Q79.8438,165.5 80.4688,164.9219 L80.4688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="91.5" y="166.1543">B</text>
@@ -66,18 +66,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="108.5" y="155.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="63.5" x2="121.5" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzh93lh5antst)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fyp0w8cctwro4)" height="60.8047" id="C_0001880966578968892571" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="26.5" y="8"/>
       <ellipse cx="84.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M87.2188,29.6406 Q86.6406,29.9375 86,30.0781 Q85.3594,30.2344 84.6563,30.2344 Q82.1563,30.2344 80.8281,28.5938 Q79.5156,26.9375 79.5156,23.8125 Q79.5156,20.6875 80.8281,19.0313 Q82.1563,17.375 84.6563,17.375 Q85.3594,17.375 86,17.5313 Q86.6563,17.6875 87.2188,17.9844 L87.2188,20.7031 Q86.5938,20.125 86,19.8594 Q85.4063,19.5781 84.7813,19.5781 Q83.4375,19.5781 82.75,20.6563 Q82.0625,21.7188 82.0625,23.8125 Q82.0625,25.9063 82.75,26.9844 Q83.4375,28.0469 84.7813,28.0469 Q85.4063,28.0469 86,27.7813 Q86.5938,27.5 87.2188,26.9219 L87.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="104.75" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="32.5" y="46"/>
       <ellipse cx="37.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L20" target="_top" title="aintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00010/t00010.cc#L20" xlink:show="new" xlink:title="aintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="106" x="46.5" y="54.2104">aintstring : B&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="27.5" x2="157.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md
index 0c792259..d2da0251 100644
--- a/docs/test_cases/t00011.md
+++ b/docs/test_cases/t00011.md
@@ -54,3 +54,144 @@ public:
 ```
 ## Generated UML diagrams
 ![t00011_class](./t00011_class.svg "Friend relationships")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00011::D<T>",
+      "id": "1150639902748052276",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "value",
+          "source_location": {
+            "file": "../../tests/t00011/t00011.cc",
+            "line": 11
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00011",
+      "source_location": {
+        "file": "../../tests/t00011/t00011.cc",
+        "line": 10
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00011::A",
+      "id": "1420516952857803719",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00011",
+      "source_location": {
+        "file": "../../tests/t00011/t00011.cc",
+        "line": 14
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00011::B",
+      "id": "1687427603952049829",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "m_a",
+          "source_location": {
+            "file": "../../tests/t00011/t00011.cc",
+            "line": 29
+          },
+          "type": "clanguml::t00011::A *"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "B",
+      "namespace": "clanguml::t00011",
+      "source_location": {
+        "file": "../../tests/t00011/t00011.cc",
+        "line": 26
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00011_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1687427603952049829",
+      "label": "<<friend>>",
+      "source": "1420516952857803719",
+      "type": "friendship"
+    },
+    {
+      "access": "public",
+      "destination": "1420516952857803719",
+      "label": "m_a",
+      "source": "1687427603952049829",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00011"
+}
+```
diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg
index 69e902f1..d059675c 100644
--- a/docs/test_cases/t00011_class.svg
+++ b/docs/test_cases/t00011_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:226px;height:230px;" version="1.1" viewBox="0 0 226 230" width="226px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1e8itxdzrm4a1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f141d3uzuz0k5a" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e8itxdzrm4a1)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L10" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L10" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f141d3uzuz0k5a)" height="60.8047" id="C_0001150639902748052276" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="6" y="8"/>
       <ellipse cx="31.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.3188,29.6406 Q33.7406,29.9375 33.1,30.0781 Q32.4594,30.2344 31.7563,30.2344 Q29.2563,30.2344 27.9281,28.5938 Q26.6156,26.9375 26.6156,23.8125 Q26.6156,20.6875 27.9281,19.0313 Q29.2563,17.375 31.7563,17.375 Q32.4594,17.375 33.1,17.5313 Q33.7563,17.6875 34.3188,17.9844 L34.3188,20.7031 Q33.6938,20.125 33.1,19.8594 Q32.5063,19.5781 31.8813,19.5781 Q30.5375,19.5781 29.85,20.6563 Q29.1625,21.7188 29.1625,23.8125 Q29.1625,25.9063 29.85,26.9844 Q30.5375,28.0469 31.8813,28.0469 Q32.5063,28.0469 33.1,27.7813 Q33.6938,27.5 34.3188,26.9219 L34.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="47.65" y="28.1543">D</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="76" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L11" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L11" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="26" y="54.2104">value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="80" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e8itxdzrm4a1)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f141d3uzuz0k5a)" height="60.8047" id="C_0001420516952857803719" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="8"/>
       <ellipse cx="152.15" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,29.6406 Q154.5406,29.9375 153.9,30.0781 Q153.2594,30.2344 152.5563,30.2344 Q150.0563,30.2344 148.7281,28.5938 Q147.4156,26.9375 147.4156,23.8125 Q147.4156,20.6875 148.7281,19.0313 Q150.0563,17.375 152.5563,17.375 Q153.2594,17.375 153.9,17.5313 Q154.5563,17.6875 155.1188,17.9844 L155.1188,20.7031 Q154.4938,20.125 153.9,19.8594 Q153.3063,19.5781 152.6813,19.5781 Q151.3375,19.5781 150.65,20.6563 Q149.9625,21.7188 149.9625,23.8125 Q149.9625,25.9063 150.65,26.9844 Q151.3375,28.0469 152.6813,28.0469 Q153.3063,28.0469 153.9,27.7813 Q154.4938,27.5 155.1188,26.9219 L155.1188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="28.1543">A</text>
@@ -36,18 +36,18 @@
       <ellipse cx="127" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="136" y="62.2104">foo() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1e8itxdzrm4a1)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f141d3uzuz0k5a)" height="73.6094" id="C_0001687427603952049829" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="116" y="146"/>
       <ellipse cx="152.15" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M155.1188,167.6406 Q154.5406,167.9375 153.9,168.0781 Q153.2594,168.2344 152.5563,168.2344 Q150.0563,168.2344 148.7281,166.5938 Q147.4156,164.9375 147.4156,161.8125 Q147.4156,158.6875 148.7281,157.0313 Q150.0563,155.375 152.5563,155.375 Q153.2594,155.375 153.9,155.5313 Q154.5563,155.6875 155.1188,155.9844 L155.1188,158.7031 Q154.4938,158.125 153.9,157.8594 Q153.3063,157.5781 152.6813,157.5781 Q151.3375,157.5781 150.65,158.6563 Q149.9625,159.7188 149.9625,161.8125 Q149.9625,163.9063 150.65,164.9844 Q151.3375,166.0469 152.6813,166.0469 Q153.3063,166.0469 153.9,165.7813 Q154.4938,165.5 155.1188,164.9219 L155.1188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="170.85" y="166.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="122" y="184"/>
       <ellipse cx="127" cy="189" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L29" target="_top" title="m_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00011/t00011.cc#L29" xlink:show="new" xlink:title="m_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="136" y="192.2104">m_a : A *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="117" x2="202" y1="198.8047" y2="198.8047"/>
diff --git a/docs/test_cases/t00012.md b/docs/test_cases/t00012.md
index 36ba1629..ec28a58c 100644
--- a/docs/test_cases/t00012.md
+++ b/docs/test_cases/t00012.md
@@ -61,3 +61,510 @@ class R {
 ```
 ## Generated UML diagrams
 ![t00012_class](./t00012_class.svg "Advanced template instantiations")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::A<T,Ts...>",
+      "id": "1773299890023132282",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "value",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 12
+          },
+          "type": "T"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "values",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 13
+          },
+          "type": "std::variant<Ts...>"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00012",
+      "source_location": {
+        "file": "../../tests/t00012/t00012.cc",
+        "line": 11
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Ts...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::B<int... Is>",
+      "id": "2061171077567279746",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "ints",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 17
+          },
+          "type": "std::array<int,sizeof...(Is)>"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00012",
+      "source_location": {
+        "file": "../../tests/t00012/t00012.cc",
+        "line": 16
+      },
+      "template_parameters": [
+        {
+          "is_variadic": true,
+          "kind": "non_type_template",
+          "name": "Is",
+          "template_parameters": [],
+          "type": "int..."
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::C<T,int... Is>",
+      "id": "627809578407650629",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "ints",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 21
+          },
+          "type": "std::array<T,sizeof...(Is)>"
+        }
+      ],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00012",
+      "source_location": {
+        "file": "../../tests/t00012/t00012.cc",
+        "line": 20
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "non_type_template",
+          "name": "Is",
+          "template_parameters": [],
+          "type": "int..."
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::A<int,std::string,float>",
+      "id": "286972398942005457",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00012",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "float"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::A<int,std::string,bool>",
+      "id": "299466181098300963",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00012",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "bool"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::B<3,2,1>",
+      "id": "489063277971613593",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00012",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "3"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "2"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "1"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::B<1,1,1,1>",
+      "id": "14232362483200599",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00012",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "1"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "1"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "1"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "1"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>",
+      "id": "1478239414632239754",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00012",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "int"
+            },
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "argument",
+                  "template_parameters": [
+                    {
+                      "is_variadic": false,
+                      "kind": "argument",
+                      "template_parameters": [
+                        {
+                          "is_variadic": false,
+                          "kind": "argument",
+                          "template_parameters": [],
+                          "type": "std::string"
+                        }
+                      ],
+                      "type": "std::vector"
+                    }
+                  ],
+                  "type": "std::vector"
+                }
+              ],
+              "type": "std::vector"
+            }
+          ],
+          "type": "std::map"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "3"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "3"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "3"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00012::R",
+      "id": "559263385732885469",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "a1",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 25
+          },
+          "type": "A<int,std::string,float>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "a2",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 26
+          },
+          "type": "A<int,std::string,bool>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "b1",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 28
+          },
+          "type": "B<3,2,1>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "b2",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 29
+          },
+          "type": "B<1,1,1,1>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "c1",
+          "source_location": {
+            "file": "../../tests/t00012/t00012.cc",
+            "line": 33
+          },
+          "type": "C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00012",
+      "source_location": {
+        "file": "../../tests/t00012/t00012.cc",
+        "line": 24
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00012_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1773299890023132282",
+      "source": "286972398942005457",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1773299890023132282",
+      "source": "299466181098300963",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2061171077567279746",
+      "source": "489063277971613593",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2061171077567279746",
+      "source": "14232362483200599",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "627809578407650629",
+      "source": "1478239414632239754",
+      "type": "instantiation"
+    },
+    {
+      "access": "private",
+      "destination": "286972398942005457",
+      "label": "a1",
+      "source": "559263385732885469",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "299466181098300963",
+      "label": "a2",
+      "source": "559263385732885469",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "489063277971613593",
+      "label": "b1",
+      "source": "559263385732885469",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "14232362483200599",
+      "label": "b2",
+      "source": "559263385732885469",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1478239414632239754",
+      "label": "c1",
+      "source": "559263385732885469",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00012"
+}
+```
diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg
index 415f4e3c..64719ffb 100644
--- a/docs/test_cases/t00012_class.svg
+++ b/docs/test_cases/t00012_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:1362px;height:390px;" version="1.1" viewBox="0 0 1362 390" width="1362px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fvsr9oyn1qtgi" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f165da8xbvgebj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="73.6094" id="C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="822" y="306"/>
       <ellipse cx="885.75" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M888.7188,327.6406 Q888.1406,327.9375 887.5,328.0781 Q886.8594,328.2344 886.1563,328.2344 Q883.6563,328.2344 882.3281,326.5938 Q881.0156,324.9375 881.0156,321.8125 Q881.0156,318.6875 882.3281,317.0313 Q883.6563,315.375 886.1563,315.375 Q886.8594,315.375 887.5,315.5313 Q888.1563,315.6875 888.7188,315.9844 L888.7188,318.7031 Q888.0938,318.125 887.5,317.8594 Q886.9063,317.5781 886.2813,317.5781 Q884.9375,317.5781 884.25,318.6563 Q883.5625,319.7188 883.5625,321.8125 Q883.5625,323.9063 884.25,324.9844 Q884.9375,326.0469 886.2813,326.0469 Q886.9063,326.0469 887.5,325.7813 Q888.0938,325.5 888.7188,324.9219 L888.7188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="906.25" y="326.1543">A</text>
@@ -18,23 +18,23 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="972" y="315.1387">T,Ts...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="344"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L12" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L12" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="49" x="842" y="352.2104">value : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="828" y="356.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="830" y="358.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L13" target="_top" title="values" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L13" xlink:show="new" xlink:title="values" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="842" y="365.0151">values : std::variant&lt;Ts...&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="823" x2="1005" y1="371.6094" y2="371.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="60.8047" id="C_0002061171077567279746" style="stroke: #A80036; stroke-width: 1.5;" width="214" x="1134" y="312.5"/>
       <ellipse cx="1209.75" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1212.7188,334.1406 Q1212.1406,334.4375 1211.5,334.5781 Q1210.8594,334.7344 1210.1563,334.7344 Q1207.6563,334.7344 1206.3281,333.0938 Q1205.0156,331.4375 1205.0156,328.3125 Q1205.0156,325.1875 1206.3281,323.5313 Q1207.6563,321.875 1210.1563,321.875 Q1210.8594,321.875 1211.5,322.0313 Q1212.1563,322.1875 1212.7188,322.4844 L1212.7188,325.2031 Q1212.0938,324.625 1211.5,324.3594 Q1210.9063,324.0781 1210.2813,324.0781 Q1208.9375,324.0781 1208.25,325.1563 Q1207.5625,326.2188 1207.5625,328.3125 Q1207.5625,330.4063 1208.25,331.4844 Q1208.9375,332.5469 1210.2813,332.5469 Q1210.9063,332.5469 1211.5,332.2813 Q1212.0938,332 1212.7188,331.4219 L1212.7188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1230.25" y="332.6543">B</text>
@@ -43,15 +43,15 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135" x2="1347" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1140" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="1142" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L17" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L17" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="1154" y="366.7104">ints : std::array&lt;int,sizeof...(Is)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="60.8047" id="C_0000627809578407650629" style="stroke: #A80036; stroke-width: 1.5;" width="207" x="149.5" y="312.5"/>
       <ellipse cx="216.25" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M219.2188,334.1406 Q218.6406,334.4375 218,334.5781 Q217.3594,334.7344 216.6563,334.7344 Q214.1563,334.7344 212.8281,333.0938 Q211.5156,331.4375 211.5156,328.3125 Q211.5156,325.1875 212.8281,323.5313 Q214.1563,321.875 216.6563,321.875 Q217.3594,321.875 218,322.0313 Q218.6563,322.1875 219.2188,322.4844 L219.2188,325.2031 Q218.5938,324.625 218,324.3594 Q217.4063,324.0781 216.7813,324.0781 Q215.4375,324.0781 214.75,325.1563 Q214.0625,326.2188 214.0625,328.3125 Q214.0625,330.4063 214.75,331.4844 Q215.4375,332.5469 216.7813,332.5469 Q217.4063,332.5469 218,332.2813 Q218.5938,332 219.2188,331.4219 L219.2188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="236.75" y="332.6543">C</text>
@@ -60,14 +60,14 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="344.5" y2="344.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="150.5" x2="355.5" y1="352.5" y2="352.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="155.5" y="358.5"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="157.5" y="360.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L21" target="_top" title="ints" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L21" xlink:show="new" xlink:title="ints" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="169.5" y="366.7104">ints : std::array&lt;T,sizeof...(Is)&gt;</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="48" id="C_0000286972398942005457" style="stroke: #A80036; stroke-width: 1.5;" width="158" x="758" y="197"/>
     <ellipse cx="773" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M775.9688,218.6406 Q775.3906,218.9375 774.75,219.0781 Q774.1094,219.2344 773.4063,219.2344 Q770.9063,219.2344 769.5781,217.5938 Q768.2656,215.9375 768.2656,212.8125 Q768.2656,209.6875 769.5781,208.0313 Q770.9063,206.375 773.4063,206.375 Q774.1094,206.375 774.75,206.5313 Q775.4063,206.6875 775.9688,206.9844 L775.9688,209.7031 Q775.3438,209.125 774.75,208.8594 Q774.1563,208.5781 773.5313,208.5781 Q772.1875,208.5781 771.5,209.6563 Q770.8125,210.7188 770.8125,212.8125 Q770.8125,214.9063 771.5,215.9844 Q772.1875,217.0469 773.5313,217.0469 Q774.1563,217.0469 774.75,216.7813 Q775.3438,216.5 775.9688,215.9219 L775.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="787" y="217.1543">A</text>
@@ -75,7 +75,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="804" y="206.1387">int,std::string,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="759" x2="915" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="48" id="C_0000299466181098300963" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="951.5" y="197"/>
     <ellipse cx="966.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M969.4688,218.6406 Q968.8906,218.9375 968.25,219.0781 Q967.6094,219.2344 966.9063,219.2344 Q964.4063,219.2344 963.0781,217.5938 Q961.7656,215.9375 961.7656,212.8125 Q961.7656,209.6875 963.0781,208.0313 Q964.4063,206.375 966.9063,206.375 Q967.6094,206.375 968.25,206.5313 Q968.9063,206.6875 969.4688,206.9844 L969.4688,209.7031 Q968.8438,209.125 968.25,208.8594 Q967.6563,208.5781 967.0313,208.5781 Q965.6875,208.5781 965,209.6563 Q964.3125,210.7188 964.3125,212.8125 Q964.3125,214.9063 965,215.9844 Q965.6875,217.0469 967.0313,217.0469 Q967.6563,217.0469 968.25,216.7813 Q968.8438,216.5 969.4688,215.9219 L969.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="980.5" y="217.1543">A</text>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="113" x="997.5" y="206.1387">int,std::string,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="952.5" x2="1107.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="48" id="C_0000489063277971613593" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="1144" y="197"/>
     <ellipse cx="1159" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1161.9688,218.6406 Q1161.3906,218.9375 1160.75,219.0781 Q1160.1094,219.2344 1159.4063,219.2344 Q1156.9063,219.2344 1155.5781,217.5938 Q1154.2656,215.9375 1154.2656,212.8125 Q1154.2656,209.6875 1155.5781,208.0313 Q1156.9063,206.375 1159.4063,206.375 Q1160.1094,206.375 1160.75,206.5313 Q1161.4063,206.6875 1161.9688,206.9844 L1161.9688,209.7031 Q1161.3438,209.125 1160.75,208.8594 Q1160.1563,208.5781 1159.5313,208.5781 Q1158.1875,208.5781 1157.5,209.6563 Q1156.8125,210.7188 1156.8125,212.8125 Q1156.8125,214.9063 1157.5,215.9844 Q1158.1875,217.0469 1159.5313,217.0469 Q1160.1563,217.0469 1160.75,216.7813 Q1161.3438,216.5 1161.9688,215.9219 L1161.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1173" y="217.1543">B</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="1190" y="206.1387">3,2,1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1145" x2="1219" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="48" id="C_0000014232362483200599" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="1255" y="197"/>
     <ellipse cx="1270" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1272.9688,218.6406 Q1272.3906,218.9375 1271.75,219.0781 Q1271.1094,219.2344 1270.4063,219.2344 Q1267.9063,219.2344 1266.5781,217.5938 Q1265.2656,215.9375 1265.2656,212.8125 Q1265.2656,209.6875 1266.5781,208.0313 Q1267.9063,206.375 1270.4063,206.375 Q1271.1094,206.375 1271.75,206.5313 Q1272.4063,206.6875 1272.9688,206.9844 L1272.9688,209.7031 Q1272.3438,209.125 1271.75,208.8594 Q1271.1563,208.5781 1270.5313,208.5781 Q1269.1875,208.5781 1268.5,209.6563 Q1267.8125,210.7188 1267.8125,212.8125 Q1267.8125,214.9063 1268.5,215.9844 Q1269.1875,217.0469 1270.5313,217.0469 Q1271.1563,217.0469 1271.75,216.7813 Q1272.3438,216.5 1272.9688,215.9219 L1272.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1284" y="217.1543">B</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="44" x="1301" y="206.1387">1,1,1,1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1256" x2="1342" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="48" id="C_0001478239414632239754" style="stroke: #A80036; stroke-width: 1.5;" width="494" x="6" y="197"/>
     <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">C</text>
@@ -107,50 +107,50 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="450" x="52" y="206.1387">std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="499" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fvsr9oyn1qtgi)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165da8xbvgebj)" height="112.0234" id="C_0000559263385732885469" style="stroke: #A80036; stroke-width: 1.5;" width="493" x="783.5" y="8"/>
       <ellipse cx="1021.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1024.7188,29.6406 Q1024.1406,29.9375 1023.5,30.0781 Q1022.8594,30.2344 1022.1563,30.2344 Q1019.6563,30.2344 1018.3281,28.5938 Q1017.0156,26.9375 1017.0156,23.8125 Q1017.0156,20.6875 1018.3281,19.0313 Q1019.6563,17.375 1022.1563,17.375 Q1022.8594,17.375 1023.5,17.5313 Q1024.1563,17.6875 1024.7188,17.9844 L1024.7188,20.7031 Q1024.0938,20.125 1023.5,19.8594 Q1022.9063,19.5781 1022.2813,19.5781 Q1020.9375,19.5781 1020.25,20.6563 Q1019.5625,21.7188 1019.5625,23.8125 Q1019.5625,25.9063 1020.25,26.9844 Q1020.9375,28.0469 1022.2813,28.0469 Q1022.9063,28.0469 1023.5,27.7813 Q1024.0938,27.5 1024.7188,26.9219 L1024.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1042.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L25" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L25" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="157" x="803.5" y="54.2104">a1 : A&lt;int,std::string,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L26" target="_top" title="a2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L26" xlink:show="new" xlink:title="a2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="156" x="803.5" y="67.0151">a2 : A&lt;int,std::string,bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L28" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L28" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="81" x="803.5" y="79.8198">b1 : B&lt;3,2,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L29" target="_top" title="b2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L29" xlink:show="new" xlink:title="b2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="803.5" y="92.6245">b2 : B&lt;1,1,1,1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="789.5" y="97.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="791.5" y="99.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L33" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00012/t00012.cc#L33" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="467" x="803.5" y="105.4292">c1 : C&lt;std::map&lt;int,std::vector&lt;std::vector&lt;std::vector&lt;std::string&gt;&gt;&gt;&gt;,3,3,3&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="784.5" x2="1275.5" y1="112.0234" y2="112.0234"/>
-    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#fvsr9oyn1qtgi)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M535.5,208.5 L535.5,217 L500.12,221 L535.5,225 L535.5,233.6328 A0,0 0 0 0 535.5,233.6328 L722.5,233.6328 A0,0 0 0 0 722.5,233.6328 L722.5,218.5 L712.5,208.5 L535.5,208.5 A0,0 0 0 0 535.5,208.5 " fill="#FBFB77" filter="url(#f165da8xbvgebj)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M712.5,208.5 L712.5,218.5 L722.5,218.5 L712.5,208.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="166" x="541.5" y="225.5669">Long template annotation</text>
     <path d="M851.85,245.14 C859.85,257.61 870.07,273.55 879.91,288.88 " fill="none" id="C_0000286972398942005457-&gt;C_0001773299890023132282" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md
index 9e7cf9fb..a60e8de4 100644
--- a/docs/test_cases/t00013.md
+++ b/docs/test_cases/t00013.md
@@ -89,3 +89,712 @@ private:
 ```
 ## Generated UML diagrams
 ![t00013_class](./t00013_class.svg "Template instantiation relationships")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "ABCD::F<T>",
+      "id": "952770730316239752",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 8
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "F",
+      "namespace": "ABCD",
+      "source_location": {
+        "file": "../../tests/t00013/t00013.cc",
+        "line": 7
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "ABCD::F<int>",
+      "id": "2304215469403389354",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "F",
+      "namespace": "ABCD",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::A",
+      "id": "519995486237427479",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 15
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00013",
+      "source_location": {
+        "file": "../../tests/t00013/t00013.cc",
+        "line": 14
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::B",
+      "id": "1177487653597650440",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 19
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00013",
+      "source_location": {
+        "file": "../../tests/t00013/t00013.cc",
+        "line": 18
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::C",
+      "id": "1028245818073128358",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 23
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00013",
+      "source_location": {
+        "file": "../../tests/t00013/t00013.cc",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::D",
+      "id": "409373870621931875",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "d",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 29
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "print",
+          "parameters": [
+            {
+              "name": "r",
+              "type": "clanguml::t00013::R *"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "D",
+      "namespace": "clanguml::t00013",
+      "source_location": {
+        "file": "../../tests/t00013/t00013.cc",
+        "line": 28
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::E<T>",
+      "id": "864055993755439230",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 34
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00013",
+      "source_location": {
+        "file": "../../tests/t00013/t00013.cc",
+        "line": 33
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::G<T,Args...>",
+      "id": "205927019127027617",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "g",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 38
+          },
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "args",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 39
+          },
+          "type": "std::tuple<Args...>"
+        }
+      ],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00013",
+      "source_location": {
+        "file": "../../tests/t00013/t00013.cc",
+        "line": 37
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Args...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::E<int>",
+      "id": "1977486318799565722",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00013",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::G<int,float,std::string>",
+      "id": "1526733274613822014",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00013",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "float"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::E<std::string>",
+      "id": "531523220915557686",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00013",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00013::R",
+      "id": "2198686676355573844",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "gintstring",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 60
+          },
+          "type": "G<int,float,std::string>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "estring",
+          "source_location": {
+            "file": "../../tests/t00013/t00013.cc",
+            "line": 63
+          },
+          "type": "E<std::string>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_a",
+          "parameters": [
+            {
+              "name": "a",
+              "type": "clanguml::t00013::A *"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_b",
+          "parameters": [
+            {
+              "name": "b",
+              "type": "clanguml::t00013::B &"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_const_b",
+          "parameters": [
+            {
+              "name": "b",
+              "type": "const clanguml::t00013::B &"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_c",
+          "parameters": [
+            {
+              "name": "c",
+              "type": "clanguml::t00013::C"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_d",
+          "parameters": [
+            {
+              "name": "d",
+              "type": "clanguml::t00013::D &&"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_d2",
+          "parameters": [
+            {
+              "name": "d",
+              "type": "clanguml::t00013::D &&"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_int_e",
+          "parameters": [
+            {
+              "name": "e",
+              "type": "const clanguml::t00013::E<int> &"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_int_e2",
+          "parameters": [
+            {
+              "name": "e",
+              "type": "clanguml::t00013::E<int> &"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_int_f",
+          "parameters": [
+            {
+              "name": "f",
+              "type": "const ABCD::F<int> &"
+            }
+          ],
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_e",
+          "parameters": [
+            {
+              "name": "e",
+              "type": "E<T>"
+            }
+          ],
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_f",
+          "parameters": [
+            {
+              "name": "f",
+              "type": "const F<T> &"
+            }
+          ],
+          "type": "T"
+        }
+      ],
+      "name": "R",
+      "namespace": "clanguml::t00013",
+      "source_location": {
+        "file": "../../tests/t00013/t00013.cc",
+        "line": 43
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00013_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "952770730316239752",
+      "source": "2304215469403389354",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2198686676355573844",
+      "source": "409373870621931875",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "864055993755439230",
+      "source": "1977486318799565722",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "205927019127027617",
+      "source": "1526733274613822014",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "864055993755439230",
+      "source": "531523220915557686",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "519995486237427479",
+      "source": "2198686676355573844",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1177487653597650440",
+      "source": "2198686676355573844",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1028245818073128358",
+      "source": "2198686676355573844",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "409373870621931875",
+      "source": "2198686676355573844",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1977486318799565722",
+      "source": "2198686676355573844",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2304215469403389354",
+      "source": "2198686676355573844",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "864055993755439230",
+      "source": "2198686676355573844",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "952770730316239752",
+      "source": "2198686676355573844",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1526733274613822014",
+      "label": "gintstring",
+      "source": "2198686676355573844",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "531523220915557686",
+      "label": "estring",
+      "source": "2198686676355573844",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00013"
+}
+```
diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg
index 10405d04..b9c163dd 100644
--- a/docs/test_cases/t00013_class.svg
+++ b/docs/test_cases/t00013_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="518px" preserveAspectRatio="none" style="width:1138px;height:518px;" version="1.1" viewBox="0 0 1138 518" width="1138px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fzq6vatjgm3uo" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fc84gsy9b3xwg" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L7" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L7" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="60.8047" id="C_0000952770730316239752" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="161" y="440.5"/>
       <ellipse cx="176" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,462.1406 Q178.3906,462.4375 177.75,462.5781 Q177.1094,462.7344 176.4063,462.7344 Q173.9063,462.7344 172.5781,461.0938 Q171.2656,459.4375 171.2656,456.3125 Q171.2656,453.1875 172.5781,451.5313 Q173.9063,449.875 176.4063,449.875 Q177.1094,449.875 177.75,450.0313 Q178.4063,450.1875 178.9688,450.4844 L178.9688,453.2031 Q178.3438,452.625 177.75,452.3594 Q177.1563,452.0781 176.5313,452.0781 Q175.1875,452.0781 174.5,453.1563 Q173.8125,454.2188 173.8125,456.3125 Q173.8125,458.4063 174.5,459.4844 Q175.1875,460.5469 176.5313,460.5469 Q177.1563,460.5469 177.75,460.2813 Q178.3438,460 178.9688,459.4219 L178.9688,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="190" y="460.6543">ABCD::F</text>
@@ -18,15 +18,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="247" y="449.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="472.5" y2="472.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167" y="478.5"/>
       <ellipse cx="172" cy="483.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="181" y="486.7104">f : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="251" y1="493.3047" y2="493.3047"/>
-    <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="48" id="C_0002304215469403389354" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="233.5" y="312"/>
     <ellipse cx="248.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M251.4688,333.6406 Q250.8906,333.9375 250.25,334.0781 Q249.6094,334.2344 248.9063,334.2344 Q246.4063,334.2344 245.0781,332.5938 Q243.7656,330.9375 243.7656,327.8125 Q243.7656,324.6875 245.0781,323.0313 Q246.4063,321.375 248.9063,321.375 Q249.6094,321.375 250.25,321.5313 Q250.9063,321.6875 251.4688,321.9844 L251.4688,324.7031 Q250.8438,324.125 250.25,323.8594 Q249.6563,323.5781 249.0313,323.5781 Q247.6875,323.5781 247,324.6563 Q246.3125,325.7188 246.3125,327.8125 Q246.3125,329.9063 247,330.9844 Q247.6875,332.0469 249.0313,332.0469 Q249.6563,332.0469 250.25,331.7813 Q250.8438,331.5 251.4688,330.9219 L251.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="262.5" y="332.1543">ABCD::F</text>
@@ -34,70 +34,70 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="319.5" y="321.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="234.5" x2="332.5" y1="352" y2="352"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="60.8047" id="C_0000519995486237427479" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="369" y="305.5"/>
       <ellipse cx="392.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.5188,327.1406 Q394.9406,327.4375 394.3,327.5781 Q393.6594,327.7344 392.9563,327.7344 Q390.4563,327.7344 389.1281,326.0938 Q387.8156,324.4375 387.8156,321.3125 Q387.8156,318.1875 389.1281,316.5313 Q390.4563,314.875 392.9563,314.875 Q393.6594,314.875 394.3,315.0313 Q394.9563,315.1875 395.5188,315.4844 L395.5188,318.2031 Q394.8938,317.625 394.3,317.3594 Q393.7063,317.0781 393.0813,317.0781 Q391.7375,317.0781 391.05,318.1563 Q390.3625,319.2188 390.3625,321.3125 Q390.3625,323.4063 391.05,324.4844 Q391.7375,325.5469 393.0813,325.5469 Q393.7063,325.5469 394.3,325.2813 Q394.8938,325 395.5188,324.4219 L395.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="408.45" y="325.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="375" y="343.5"/>
       <ellipse cx="380" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="389" y="351.7104">a : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="370" x2="427" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L18" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L18" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="60.8047" id="C_0001177487653597650440" style="stroke: #A80036; stroke-width: 1.5;" width="59" x="463" y="305.5"/>
       <ellipse cx="486.55" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M489.5188,327.1406 Q488.9406,327.4375 488.3,327.5781 Q487.6594,327.7344 486.9563,327.7344 Q484.4563,327.7344 483.1281,326.0938 Q481.8156,324.4375 481.8156,321.3125 Q481.8156,318.1875 483.1281,316.5313 Q484.4563,314.875 486.9563,314.875 Q487.6594,314.875 488.3,315.0313 Q488.9563,315.1875 489.5188,315.4844 L489.5188,318.2031 Q488.8938,317.625 488.3,317.3594 Q487.7063,317.0781 487.0813,317.0781 Q485.7375,317.0781 485.05,318.1563 Q484.3625,319.2188 484.3625,321.3125 Q484.3625,323.4063 485.05,324.4844 Q485.7375,325.5469 487.0813,325.5469 Q487.7063,325.5469 488.3,325.2813 Q488.8938,325 489.5188,324.4219 L489.5188,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="502.45" y="325.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="469" y="343.5"/>
       <ellipse cx="474" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L19" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L19" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="483" y="351.7104">b : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="464" x2="521" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L22" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L22" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="60.8047" id="C_0001028245818073128358" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="557.5" y="305.5"/>
       <ellipse cx="580.6" cy="321.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M583.5688,327.1406 Q582.9906,327.4375 582.35,327.5781 Q581.7094,327.7344 581.0063,327.7344 Q578.5063,327.7344 577.1781,326.0938 Q575.8656,324.4375 575.8656,321.3125 Q575.8656,318.1875 577.1781,316.5313 Q578.5063,314.875 581.0063,314.875 Q581.7094,314.875 582.35,315.0313 Q583.0063,315.1875 583.5688,315.4844 L583.5688,318.2031 Q582.9438,317.625 582.35,317.3594 Q581.7563,317.0781 581.1313,317.0781 Q579.7875,317.0781 579.1,318.1563 Q578.4125,319.2188 578.4125,321.3125 Q578.4125,323.4063 579.1,324.4844 Q579.7875,325.5469 581.1313,325.5469 Q581.7563,325.5469 582.35,325.2813 Q582.9438,325 583.5688,324.4219 L583.5688,327.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="596.4" y="325.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="337.5" y2="337.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="563.5" y="343.5"/>
       <ellipse cx="568.5" cy="348.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L23" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L23" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="577.5" y="351.7104">c : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="558.5" x2="614.5" y1="358.3047" y2="358.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L28" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L28" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="73.6094" id="C_0000409373870621931875" style="stroke: #A80036; stroke-width: 1.5;" width="121" x="6" y="299"/>
       <ellipse cx="57.75" cy="315" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7188,320.6406 Q60.1406,320.9375 59.5,321.0781 Q58.8594,321.2344 58.1563,321.2344 Q55.6563,321.2344 54.3281,319.5938 Q53.0156,317.9375 53.0156,314.8125 Q53.0156,311.6875 54.3281,310.0313 Q55.6563,308.375 58.1563,308.375 Q58.8594,308.375 59.5,308.5313 Q60.1563,308.6875 60.7188,308.9844 L60.7188,311.7031 Q60.0938,311.125 59.5,310.8594 Q58.9063,310.5781 58.2813,310.5781 Q56.9375,310.5781 56.25,311.6563 Q55.5625,312.7188 55.5625,314.8125 Q55.5625,316.9063 56.25,317.9844 Q56.9375,319.0469 58.2813,319.0469 Q58.9063,319.0469 59.5,318.7813 Q60.0938,318.5 60.7188,317.9219 L60.7188,320.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="78.25" y="319.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="331" y2="331"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="337"/>
       <ellipse cx="17" cy="342" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L29" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L29" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="345.2104">d : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="126" y1="351.8047" y2="351.8047"/>
     <ellipse cx="17" cy="362.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="95" x="26" y="366.0151">print(R * r) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L33" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L33" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="60.8047" id="C_0000864055993755439230" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="795.5" y="440.5"/>
       <ellipse cx="810.95" cy="456.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M813.9188,462.1406 Q813.3406,462.4375 812.7,462.5781 Q812.0594,462.7344 811.3563,462.7344 Q808.8563,462.7344 807.5281,461.0938 Q806.2156,459.4375 806.2156,456.3125 Q806.2156,453.1875 807.5281,451.5313 Q808.8563,449.875 811.3563,449.875 Q812.0594,449.875 812.7,450.0313 Q813.3563,450.1875 813.9188,450.4844 L813.9188,453.2031 Q813.2938,452.625 812.7,452.3594 Q812.1063,452.0781 811.4813,452.0781 Q810.1375,452.0781 809.45,453.1563 Q808.7625,454.2188 808.7625,456.3125 Q808.7625,458.4063 809.45,459.4844 Q810.1375,460.5469 811.4813,460.5469 Q812.1063,460.5469 812.7,460.2813 Q813.2938,460 813.9188,459.4219 L813.9188,462.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="825.05" y="460.6543">E</text>
@@ -105,16 +105,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="842.5" y="449.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="472.5" y2="472.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="801.5" y="478.5"/>
       <ellipse cx="806.5" cy="483.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L34" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L34" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="815.5" y="486.7104">e : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="796.5" x2="846.5" y1="493.3047" y2="493.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L37" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L37" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="73.6094" id="C_0000205927019127027617" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="950.5" y="434"/>
       <ellipse cx="1001.75" cy="450" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1004.7188,455.6406 Q1004.1406,455.9375 1003.5,456.0781 Q1002.8594,456.2344 1002.1563,456.2344 Q999.6563,456.2344 998.3281,454.5938 Q997.0156,452.9375 997.0156,449.8125 Q997.0156,446.6875 998.3281,445.0313 Q999.6563,443.375 1002.1563,443.375 Q1002.8594,443.375 1003.5,443.5313 Q1004.1563,443.6875 1004.7188,443.9844 L1004.7188,446.7031 Q1004.0938,446.125 1003.5,445.8594 Q1002.9063,445.5781 1002.2813,445.5781 Q1000.9375,445.5781 1000.25,446.6563 Q999.5625,447.7188 999.5625,449.8125 Q999.5625,451.9063 1000.25,452.9844 Q1000.9375,454.0469 1002.2813,454.0469 Q1002.9063,454.0469 1003.5,453.7813 Q1004.0938,453.5 1004.7188,452.9219 L1004.7188,455.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1022.25" y="454.1543">G</text>
@@ -122,22 +122,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="1076.5" y="443.1387">T,Args...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="466" y2="466"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="472"/>
       <ellipse cx="961.5" cy="477" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L38" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L38" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="970.5" y="480.2104">g : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="956.5" y="484.8047"/>
       <ellipse cx="961.5" cy="489.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L39" target="_top" title="args" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L39" xlink:show="new" xlink:title="args" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="970.5" y="493.0151">args : std::tuple&lt;Args...&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="951.5" x2="1123.5" y1="499.6094" y2="499.6094"/>
-    <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="48" id="C_0001977486318799565722" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="791.5" y="312"/>
     <ellipse cx="806.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M809.4688,333.6406 Q808.8906,333.9375 808.25,334.0781 Q807.6094,334.2344 806.9063,334.2344 Q804.4063,334.2344 803.0781,332.5938 Q801.7656,330.9375 801.7656,327.8125 Q801.7656,324.6875 803.0781,323.0313 Q804.4063,321.375 806.9063,321.375 Q807.6094,321.375 808.25,321.5313 Q808.9063,321.6875 809.4688,321.9844 L809.4688,324.7031 Q808.8438,324.125 808.25,323.8594 Q807.6563,323.5781 807.0313,323.5781 Q805.6875,323.5781 805,324.6563 Q804.3125,325.7188 804.3125,327.8125 Q804.3125,329.9063 805,330.9844 Q805.6875,332.0469 807.0313,332.0469 Q807.6563,332.0469 808.25,331.7813 Q808.8438,331.5 809.4688,330.9219 L809.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="820.5" y="332.1543">E</text>
@@ -145,7 +145,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="837.5" y="321.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="792.5" x2="850.5" y1="352" y2="352"/>
-    <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="48" id="C_0001526733274613822014" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="958" y="312"/>
     <ellipse cx="973" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M975.9688,333.6406 Q975.3906,333.9375 974.75,334.0781 Q974.1094,334.2344 973.4063,334.2344 Q970.9063,334.2344 969.5781,332.5938 Q968.2656,330.9375 968.2656,327.8125 Q968.2656,324.6875 969.5781,323.0313 Q970.9063,321.375 973.4063,321.375 Q974.1094,321.375 974.75,321.5313 Q975.4063,321.6875 975.9688,321.9844 L975.9688,324.7031 Q975.3438,324.125 974.75,323.8594 Q974.1563,323.5781 973.5313,323.5781 Q972.1875,323.5781 971.5,324.6563 Q970.8125,325.7188 970.8125,327.8125 Q970.8125,329.9063 971.5,330.9844 Q972.1875,332.0469 973.5313,332.0469 Q974.1563,332.0469 974.75,331.7813 Q975.3438,331.5 975.9688,330.9219 L975.9688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="987" y="332.1543">G</text>
@@ -153,7 +153,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="114" x="1005" y="321.1387">int,float,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="959" x2="1116" y1="352" y2="352"/>
-    <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
+    <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="48" id="C_0000531523220915557686" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="650.5" y="312"/>
     <ellipse cx="665.5" cy="328" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M668.4688,333.6406 Q667.8906,333.9375 667.25,334.0781 Q666.6094,334.2344 665.9063,334.2344 Q663.4063,334.2344 662.0781,332.5938 Q660.7656,330.9375 660.7656,327.8125 Q660.7656,324.6875 662.0781,323.0313 Q663.4063,321.375 665.9063,321.375 Q666.6094,321.375 667.25,321.5313 Q667.9063,321.6875 668.4688,321.9844 L668.4688,324.7031 Q667.8438,324.125 667.25,323.8594 Q666.6563,323.5781 666.0313,323.5781 Q664.6875,323.5781 664,324.6563 Q663.3125,325.7188 663.3125,327.8125 Q663.3125,329.9063 664,330.9844 Q664.6875,332.0469 666.0313,332.0469 Q666.6563,332.0469 667.25,331.7813 Q667.8438,331.5 668.4688,330.9219 L668.4688,333.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="679.5" y="332.1543">E</text>
@@ -161,25 +161,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="696.5" y="321.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="344" y2="344"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="651.5" x2="755.5" y1="352" y2="352"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fzq6vatjgm3uo)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L43" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L43" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc84gsy9b3xwg)" height="214.4609" id="C_0002198686676355573844" style="stroke: #A80036; stroke-width: 1.5;" width="242" x="371.5" y="8"/>
       <ellipse cx="484.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M487.2188,29.6406 Q486.6406,29.9375 486,30.0781 Q485.3594,30.2344 484.6563,30.2344 Q482.1563,30.2344 480.8281,28.5938 Q479.5156,26.9375 479.5156,23.8125 Q479.5156,20.6875 480.8281,19.0313 Q482.1563,17.375 484.6563,17.375 Q485.3594,17.375 486,17.5313 Q486.6563,17.6875 487.2188,17.9844 L487.2188,20.7031 Q486.5938,20.125 486,19.8594 Q485.4063,19.5781 484.7813,19.5781 Q483.4375,19.5781 482.75,20.6563 Q482.0625,21.7188 482.0625,23.8125 Q482.0625,25.9063 482.75,26.9844 Q483.4375,28.0469 484.7813,28.0469 Q485.4063,28.0469 486,27.7813 Q486.5938,27.5 487.2188,26.9219 L487.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="504.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="46"/>
       <ellipse cx="382.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L60" target="_top" title="gintstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L60" xlink:show="new" xlink:title="gintstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="391.5" y="54.2104">gintstring : G&lt;int,float,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="377.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="379.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L63" target="_top" title="estring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00013/t00013.cc#L63" xlink:show="new" xlink:title="estring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="136" x="391.5" y="67.0151">estring : E&lt;std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="372.5" x2="612.5" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00014.md b/docs/test_cases/t00014.md
index 7280649a..d9b1201d 100644
--- a/docs/test_cases/t00014.md
+++ b/docs/test_cases/t00014.md
@@ -104,3 +104,944 @@ public:
 ```
 ## Generated UML diagrams
 ![t00014_class](./t00014_class.svg "Alias template instantiation")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<T,P>",
+      "id": "765890579167335652",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "t",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 22
+          },
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "p",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 23
+          },
+          "type": "P"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "source_location": {
+        "file": "../../tests/t00014/t00014.cc",
+        "line": 21
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "P",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::B",
+      "id": "934136012292043506",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "value",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 27
+          },
+          "type": "std::string"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00014",
+      "source_location": {
+        "file": "../../tests/t00014/t00014.cc",
+        "line": 26
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<T,std::string>",
+      "id": "2186387853087008570",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "T"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<T,std::unique_ptr<std::string>>",
+      "id": "947292733740993297",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "T"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "std::string"
+            }
+          ],
+          "type": "std::unique_ptr"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<long,T>",
+      "id": "1700006390494465667",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "long"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "T"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<double,T>",
+      "id": "2017665567517853203",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "double"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "T"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<long,U>",
+      "id": "906557320263235873",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "long"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "U"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<long,bool>",
+      "id": "378898020828430636",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "long"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "bool"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<double,bool>",
+      "id": "2082013375525130414",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "double"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "bool"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<long,float>",
+      "id": "51978493292659230",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "long"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "float"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<double,float>",
+      "id": "197769253782961588",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "double"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "float"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<bool,std::string>",
+      "id": "895940711566401184",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "bool"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<float,std::unique_ptr<std::string>>",
+      "id": "1751732625010742161",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "float"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "std::string"
+            }
+          ],
+          "type": "std::unique_ptr"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<int,std::string>",
+      "id": "887121441210847583",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<std::string,std::string>",
+      "id": "1119452495635561975",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<char,std::string>",
+      "id": "640294848489463071",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "char"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::A<wchar_t,std::string>",
+      "id": "139599686499155694",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00014",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "wchar_t"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00014::R",
+      "id": "1192822659863756768",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "bapair",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 58
+          },
+          "type": "PairPairBA<bool>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "abool",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 60
+          },
+          "type": "APtr<bool>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "aboolfloat",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 61
+          },
+          "type": "AAPtr<bool,float>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "afloat",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 62
+          },
+          "type": "ASharedPtr<float>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "boolstring",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 63
+          },
+          "type": "A<bool,std::string>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "floatstring",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 64
+          },
+          "type": "AStringPtr<float>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "intstring",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 65
+          },
+          "type": "clanguml::t00014::AIntString"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "stringstring",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 66
+          },
+          "type": "clanguml::t00014::AStringString"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "bstringstring",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 67
+          },
+          "type": "clanguml::t00014::BStringString"
+        },
+        {
+          "access": "protected",
+          "is_static": false,
+          "name": "bs",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 70
+          },
+          "type": "clanguml::t00014::BVector"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "bs2",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 73
+          },
+          "type": "clanguml::t00014::BVector2"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "cb",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 74
+          },
+          "type": "SimpleCallback<clanguml::t00014::ACharString>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "gcb",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 75
+          },
+          "type": "GenericCallback<clanguml::t00014::R::AWCharString>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "vcb",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 76
+          },
+          "type": "clanguml::t00014::VoidCallback"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "vps",
+          "source_location": {
+            "file": "../../tests/t00014/t00014.cc",
+            "line": 77
+          },
+          "type": "VectorPtr<clanguml::t00014::B>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00014",
+      "source_location": {
+        "file": "../../tests/t00014/t00014.cc",
+        "line": 55
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00014_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "765890579167335652",
+      "source": "2186387853087008570",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "765890579167335652",
+      "source": "947292733740993297",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "765890579167335652",
+      "source": "1700006390494465667",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "765890579167335652",
+      "source": "2017665567517853203",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1700006390494465667",
+      "source": "906557320263235873",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1700006390494465667",
+      "source": "378898020828430636",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2017665567517853203",
+      "source": "2082013375525130414",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1700006390494465667",
+      "source": "51978493292659230",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2017665567517853203",
+      "source": "197769253782961588",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2186387853087008570",
+      "source": "895940711566401184",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "947292733740993297",
+      "source": "1751732625010742161",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2186387853087008570",
+      "source": "887121441210847583",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2186387853087008570",
+      "source": "1119452495635561975",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2186387853087008570",
+      "source": "640294848489463071",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2186387853087008570",
+      "source": "139599686499155694",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "378898020828430636",
+      "source": "1192822659863756768",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "934136012292043506",
+      "label": "bapair",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "378898020828430636",
+      "label": "bapair",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "2082013375525130414",
+      "source": "1192822659863756768",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "2082013375525130414",
+      "label": "abool",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "51978493292659230",
+      "source": "1192822659863756768",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "2082013375525130414",
+      "label": "aboolfloat",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "51978493292659230",
+      "label": "aboolfloat",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "197769253782961588",
+      "source": "1192822659863756768",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "197769253782961588",
+      "label": "afloat",
+      "source": "1192822659863756768",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "895940711566401184",
+      "label": "boolstring",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1751732625010742161",
+      "label": "floatstring",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "887121441210847583",
+      "label": "intstring",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1119452495635561975",
+      "label": "stringstring",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1119452495635561975",
+      "label": "bstringstring",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "protected",
+      "destination": "934136012292043506",
+      "label": "bs",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "934136012292043506",
+      "label": "bs2",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "640294848489463071",
+      "source": "1192822659863756768",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "139599686499155694",
+      "source": "1192822659863756768",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "934136012292043506",
+      "label": "vps",
+      "source": "1192822659863756768",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00014"
+}
+```
diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg
index 0e8c833e..1d599019 100644
--- a/docs/test_cases/t00014_class.svg
+++ b/docs/test_cases/t00014_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1078px" preserveAspectRatio="none" style="width:1100px;height:1078px;" version="1.1" viewBox="0 0 1100 1078" width="1100px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1up9zsddt0xof" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f2zr0en7omx6y" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1024" y="561"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L21" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L21" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="73.6094" id="C_0000765890579167335652" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="1024" y="561"/>
       <ellipse cx="1039" cy="577" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1041.9688,582.6406 Q1041.3906,582.9375 1040.75,583.0781 Q1040.1094,583.2344 1039.4063,583.2344 Q1036.9063,583.2344 1035.5781,581.5938 Q1034.2656,579.9375 1034.2656,576.8125 Q1034.2656,573.6875 1035.5781,572.0313 Q1036.9063,570.375 1039.4063,570.375 Q1040.1094,570.375 1040.75,570.5313 Q1041.4063,570.6875 1041.9688,570.9844 L1041.9688,573.7031 Q1041.3438,573.125 1040.75,572.8594 Q1040.1563,572.5781 1039.5313,572.5781 Q1038.1875,572.5781 1037.5,573.6563 Q1036.8125,574.7188 1036.8125,576.8125 Q1036.8125,578.9063 1037.5,579.9844 Q1038.1875,581.0469 1039.5313,581.0469 Q1040.1563,581.0469 1040.75,580.7813 Q1041.3438,580.5 1041.9688,579.9219 L1041.9688,582.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1053" y="581.1543">A</text>
@@ -18,37 +18,37 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="1070" y="570.1387">T,P</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1085" y1="593" y2="593"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1030" y="599"/>
       <ellipse cx="1035" cy="604" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L22" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L22" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="1044" y="607.2104">t : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1030" y="611.8047"/>
       <ellipse cx="1035" cy="616.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L23" target="_top" title="p" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L23" xlink:show="new" xlink:title="p" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="1044" y="620.0151">p : P</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1085" y1="626.6094" y2="626.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="481.5" y="65.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L26" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L26" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="60.8047" id="C_0000934136012292043506" style="stroke: #A80036; stroke-width: 1.5;" width="127" x="481.5" y="65.5"/>
       <ellipse cx="536.75" cy="81.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M539.7188,87.1406 Q539.1406,87.4375 538.5,87.5781 Q537.8594,87.7344 537.1563,87.7344 Q534.6563,87.7344 533.3281,86.0938 Q532.0156,84.4375 532.0156,81.3125 Q532.0156,78.1875 533.3281,76.5313 Q534.6563,74.875 537.1563,74.875 Q537.8594,74.875 538.5,75.0313 Q539.1563,75.1875 539.7188,75.4844 L539.7188,78.2031 Q539.0938,77.625 538.5,77.3594 Q537.9063,77.0781 537.2813,77.0781 Q535.9375,77.0781 535.25,78.1563 Q534.5625,79.2188 534.5625,81.3125 Q534.5625,83.4063 535.25,84.4844 Q535.9375,85.5469 537.2813,85.5469 Q537.9063,85.5469 538.5,85.2813 Q539.0938,85 539.7188,84.4219 L539.7188,87.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="557.25" y="85.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="607.5" y1="97.5" y2="97.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="487.5" y="103.5"/>
       <ellipse cx="492.5" cy="108.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L27" target="_top" title="value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L27" xlink:show="new" xlink:title="value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="101" x="501.5" y="111.7104">value : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="482.5" x2="607.5" y1="118.3047" y2="118.3047"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="789" y="832"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0002186387853087008570" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="789" y="832"/>
     <ellipse cx="804" cy="848" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M806.9688,853.6406 Q806.3906,853.9375 805.75,854.0781 Q805.1094,854.2344 804.4063,854.2344 Q801.9063,854.2344 800.5781,852.5938 Q799.2656,850.9375 799.2656,847.8125 Q799.2656,844.6875 800.5781,843.0313 Q801.9063,841.375 804.4063,841.375 Q805.1094,841.375 805.75,841.5313 Q806.4063,841.6875 806.9688,841.9844 L806.9688,844.7031 Q806.3438,844.125 805.75,843.8594 Q805.1563,843.5781 804.5313,843.5781 Q803.1875,843.5781 802.5,844.6563 Q801.8125,845.7188 801.8125,847.8125 Q801.8125,849.9063 802.5,850.9844 Q803.1875,852.0469 804.5313,852.0469 Q805.1563,852.0469 805.75,851.7813 Q806.3438,851.5 806.9688,850.9219 L806.9688,853.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="818" y="852.1543">A</text>
@@ -56,7 +56,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="835" y="841.1387">T,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="790" x2="905" y1="864" y2="864"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="790" x2="905" y1="872" y2="872"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="732" y="604"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000947292733740993297" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="732" y="604"/>
     <ellipse cx="747" cy="620" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M749.9688,625.6406 Q749.3906,625.9375 748.75,626.0781 Q748.1094,626.2344 747.4063,626.2344 Q744.9063,626.2344 743.5781,624.5938 Q742.2656,622.9375 742.2656,619.8125 Q742.2656,616.6875 743.5781,615.0313 Q744.9063,613.375 747.4063,613.375 Q748.1094,613.375 748.75,613.5313 Q749.4063,613.6875 749.9688,613.9844 L749.9688,616.7031 Q749.3438,616.125 748.75,615.8594 Q748.1563,615.5781 747.5313,615.5781 Q746.1875,615.5781 745.5,616.6563 Q744.8125,617.7188 744.8125,619.8125 Q744.8125,621.9063 745.5,622.9844 Q746.1875,624.0469 747.5313,624.0469 Q748.1563,624.0469 748.75,623.7813 Q749.3438,623.5 749.9688,622.9219 L749.9688,625.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="761" y="624.1543">A</text>
@@ -64,7 +64,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="187" x="778" y="613.1387">T,std::unique_ptr&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="733" x2="962" y1="636" y2="636"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="733" x2="962" y1="644" y2="644"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="806.5" y="303"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0001700006390494465667" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="806.5" y="303"/>
     <ellipse cx="821.5" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M824.4688,324.6406 Q823.8906,324.9375 823.25,325.0781 Q822.6094,325.2344 821.9063,325.2344 Q819.4063,325.2344 818.0781,323.5938 Q816.7656,321.9375 816.7656,318.8125 Q816.7656,315.6875 818.0781,314.0313 Q819.4063,312.375 821.9063,312.375 Q822.6094,312.375 823.25,312.5313 Q823.9063,312.6875 824.4688,312.9844 L824.4688,315.7031 Q823.8438,315.125 823.25,314.8594 Q822.6563,314.5781 822.0313,314.5781 Q820.6875,314.5781 820,315.6563 Q819.3125,316.7188 819.3125,318.8125 Q819.3125,320.9063 820,321.9844 Q820.6875,323.0469 822.0313,323.0469 Q822.6563,323.0469 823.25,322.7813 Q823.8438,322.5 824.4688,321.9219 L824.4688,324.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="835.5" y="323.1543">A</text>
@@ -72,7 +72,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="852.5" y="312.1387">long,T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="807.5" x2="887.5" y1="335" y2="335"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="807.5" x2="887.5" y1="343" y2="343"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="798.5" y="521"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0002017665567517853203" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="798.5" y="521"/>
     <ellipse cx="813.5" cy="537" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M816.4688,542.6406 Q815.8906,542.9375 815.25,543.0781 Q814.6094,543.2344 813.9063,543.2344 Q811.4063,543.2344 810.0781,541.5938 Q808.7656,539.9375 808.7656,536.8125 Q808.7656,533.6875 810.0781,532.0313 Q811.4063,530.375 813.9063,530.375 Q814.6094,530.375 815.25,530.5313 Q815.9063,530.6875 816.4688,530.9844 L816.4688,533.7031 Q815.8438,533.125 815.25,532.8594 Q814.6563,532.5781 814.0313,532.5781 Q812.6875,532.5781 812,533.6563 Q811.3125,534.7188 811.3125,536.8125 Q811.3125,538.9063 812,539.9844 Q812.6875,541.0469 814.0313,541.0469 Q814.6563,541.0469 815.25,540.7813 Q815.8438,540.5 816.4688,539.9219 L816.4688,542.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827.5" y="541.1543">A</text>
@@ -80,7 +80,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="844.5" y="530.1387">double,T</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="799.5" x2="895.5" y1="553" y2="553"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="799.5" x2="895.5" y1="561" y2="561"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="503" y="272"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000906557320263235873" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="503" y="272"/>
     <ellipse cx="518" cy="288" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M520.9688,293.6406 Q520.3906,293.9375 519.75,294.0781 Q519.1094,294.2344 518.4063,294.2344 Q515.9063,294.2344 514.5781,292.5938 Q513.2656,290.9375 513.2656,287.8125 Q513.2656,284.6875 514.5781,283.0313 Q515.9063,281.375 518.4063,281.375 Q519.1094,281.375 519.75,281.5313 Q520.4063,281.6875 520.9688,281.9844 L520.9688,284.7031 Q520.3438,284.125 519.75,283.8594 Q519.1563,283.5781 518.5313,283.5781 Q517.1875,283.5781 516.5,284.6563 Q515.8125,285.7188 515.8125,287.8125 Q515.8125,289.9063 516.5,290.9844 Q517.1875,292.0469 518.5313,292.0469 Q519.1563,292.0469 519.75,291.7813 Q520.3438,291.5 520.9688,290.9219 L520.9688,293.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="532" y="292.1543">A</text>
@@ -88,7 +88,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="549" y="281.1387">long,U</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="504" x2="586" y1="304" y2="304"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="504" x2="586" y1="312" y2="312"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="494" y="355"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000378898020828430636" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="494" y="355"/>
     <ellipse cx="509" cy="371" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M511.9688,376.6406 Q511.3906,376.9375 510.75,377.0781 Q510.1094,377.2344 509.4063,377.2344 Q506.9063,377.2344 505.5781,375.5938 Q504.2656,373.9375 504.2656,370.8125 Q504.2656,367.6875 505.5781,366.0313 Q506.9063,364.375 509.4063,364.375 Q510.1094,364.375 510.75,364.5313 Q511.4063,364.6875 511.9688,364.9844 L511.9688,367.7031 Q511.3438,367.125 510.75,366.8594 Q510.1563,366.5781 509.5313,366.5781 Q508.1875,366.5781 507.5,367.6563 Q506.8125,368.7188 506.8125,370.8125 Q506.8125,372.9063 507.5,373.9844 Q508.1875,375.0469 509.5313,375.0469 Q510.1563,375.0469 510.75,374.7813 Q511.3438,374.5 511.9688,373.9219 L511.9688,376.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="523" y="375.1543">A</text>
@@ -96,7 +96,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="58" x="540" y="364.1387">long,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="495" x2="595" y1="387" y2="387"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="495" x2="595" y1="395" y2="395"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="486" y="521"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0002082013375525130414" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="486" y="521"/>
     <ellipse cx="501" cy="537" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M503.9688,542.6406 Q503.3906,542.9375 502.75,543.0781 Q502.1094,543.2344 501.4063,543.2344 Q498.9063,543.2344 497.5781,541.5938 Q496.2656,539.9375 496.2656,536.8125 Q496.2656,533.6875 497.5781,532.0313 Q498.9063,530.375 501.4063,530.375 Q502.1094,530.375 502.75,530.5313 Q503.4063,530.6875 503.9688,530.9844 L503.9688,533.7031 Q503.3438,533.125 502.75,532.8594 Q502.1563,532.5781 501.5313,532.5781 Q500.1875,532.5781 499.5,533.6563 Q498.8125,534.7188 498.8125,536.8125 Q498.8125,538.9063 499.5,539.9844 Q500.1875,541.0469 501.5313,541.0469 Q502.1563,541.0469 502.75,540.7813 Q503.3438,540.5 503.9688,539.9219 L503.9688,542.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="515" y="541.1543">A</text>
@@ -104,7 +104,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="74" x="532" y="530.1387">double,bool</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="487" x2="603" y1="553" y2="553"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="487" x2="603" y1="561" y2="561"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="493.5" y="189"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000051978493292659230" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="493.5" y="189"/>
     <ellipse cx="508.5" cy="205" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M511.4688,210.6406 Q510.8906,210.9375 510.25,211.0781 Q509.6094,211.2344 508.9063,211.2344 Q506.4063,211.2344 505.0781,209.5938 Q503.7656,207.9375 503.7656,204.8125 Q503.7656,201.6875 505.0781,200.0313 Q506.4063,198.375 508.9063,198.375 Q509.6094,198.375 510.25,198.5313 Q510.9063,198.6875 511.4688,198.9844 L511.4688,201.7031 Q510.8438,201.125 510.25,200.8594 Q509.6563,200.5781 509.0313,200.5781 Q507.6875,200.5781 507,201.6563 Q506.3125,202.7188 506.3125,204.8125 Q506.3125,206.9063 507,207.9844 Q507.6875,209.0469 509.0313,209.0469 Q509.6563,209.0469 510.25,208.7813 Q510.8438,208.5 511.4688,207.9219 L511.4688,210.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="522.5" y="209.1543">A</text>
@@ -112,7 +112,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="59" x="539.5" y="198.1387">long,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="595.5" y1="221" y2="221"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="494.5" x2="595.5" y1="229" y2="229"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="485.5" y="438"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000197769253782961588" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="485.5" y="438"/>
     <ellipse cx="500.5" cy="454" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M503.4688,459.6406 Q502.8906,459.9375 502.25,460.0781 Q501.6094,460.2344 500.9063,460.2344 Q498.4063,460.2344 497.0781,458.5938 Q495.7656,456.9375 495.7656,453.8125 Q495.7656,450.6875 497.0781,449.0313 Q498.4063,447.375 500.9063,447.375 Q501.6094,447.375 502.25,447.5313 Q502.9063,447.6875 503.4688,447.9844 L503.4688,450.7031 Q502.8438,450.125 502.25,449.8594 Q501.6563,449.5781 501.0313,449.5781 Q499.6875,449.5781 499,450.6563 Q498.3125,451.7188 498.3125,453.8125 Q498.3125,455.9063 499,456.9844 Q499.6875,458.0469 501.0313,458.0469 Q501.6563,458.0469 502.25,457.7813 Q502.8438,457.5 503.4688,456.9219 L503.4688,459.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="514.5" y="458.1543">A</text>
@@ -120,7 +120,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="75" x="531.5" y="447.1387">double,float</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="486.5" x2="603.5" y1="470" y2="470"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="486.5" x2="603.5" y1="478" y2="478"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="476.5" y="1019"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000895940711566401184" style="stroke: #A80036; stroke-width: 1.5;" width="137" x="476.5" y="1019"/>
     <ellipse cx="491.5" cy="1035" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M494.4688,1040.6406 Q493.8906,1040.9375 493.25,1041.0781 Q492.6094,1041.2344 491.9063,1041.2344 Q489.4063,1041.2344 488.0781,1039.5938 Q486.7656,1037.9375 486.7656,1034.8125 Q486.7656,1031.6875 488.0781,1030.0313 Q489.4063,1028.375 491.9063,1028.375 Q492.6094,1028.375 493.25,1028.5313 Q493.9063,1028.6875 494.4688,1028.9844 L494.4688,1031.7031 Q493.8438,1031.125 493.25,1030.8594 Q492.6563,1030.5781 492.0313,1030.5781 Q490.6875,1030.5781 490,1031.6563 Q489.3125,1032.7188 489.3125,1034.8125 Q489.3125,1036.9063 490,1037.9844 Q490.6875,1039.0469 492.0313,1039.0469 Q492.6563,1039.0469 493.25,1038.7813 Q493.8438,1038.5 494.4688,1037.9219 L494.4688,1040.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="505.5" y="1039.1543">A</text>
@@ -128,7 +128,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="522.5" y="1028.1387">bool,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477.5" x2="612.5" y1="1051" y2="1051"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477.5" x2="612.5" y1="1059" y2="1059"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="419" y="604"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0001751732625010742161" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="419" y="604"/>
     <ellipse cx="434" cy="620" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M436.9688,625.6406 Q436.3906,625.9375 435.75,626.0781 Q435.1094,626.2344 434.4063,626.2344 Q431.9063,626.2344 430.5781,624.5938 Q429.2656,622.9375 429.2656,619.8125 Q429.2656,616.6875 430.5781,615.0313 Q431.9063,613.375 434.4063,613.375 Q435.1094,613.375 435.75,613.5313 Q436.4063,613.6875 436.9688,613.9844 L436.9688,616.7031 Q436.3438,616.125 435.75,615.8594 Q435.1563,615.5781 434.5313,615.5781 Q433.1875,615.5781 432.5,616.6563 Q431.8125,617.7188 431.8125,619.8125 Q431.8125,621.9063 432.5,622.9844 Q433.1875,624.0469 434.5313,624.0469 Q435.1563,624.0469 435.75,623.7813 Q436.3438,623.5 436.9688,622.9219 L436.9688,625.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="448" y="624.1543">A</text>
@@ -136,7 +136,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="208" x="465" y="613.1387">float,std::unique_ptr&lt;std::string&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="670" y1="636" y2="636"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="670" y1="644" y2="644"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="482" y="770"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000887121441210847583" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="482" y="770"/>
     <ellipse cx="497" cy="786" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M499.9688,791.6406 Q499.3906,791.9375 498.75,792.0781 Q498.1094,792.2344 497.4063,792.2344 Q494.9063,792.2344 493.5781,790.5938 Q492.2656,788.9375 492.2656,785.8125 Q492.2656,782.6875 493.5781,781.0313 Q494.9063,779.375 497.4063,779.375 Q498.1094,779.375 498.75,779.5313 Q499.4063,779.6875 499.9688,779.9844 L499.9688,782.7031 Q499.3438,782.125 498.75,781.8594 Q498.1563,781.5781 497.5313,781.5781 Q496.1875,781.5781 495.5,782.6563 Q494.8125,783.7188 494.8125,785.8125 Q494.8125,787.9063 495.5,788.9844 Q496.1875,790.0469 497.5313,790.0469 Q498.1563,790.0469 498.75,789.7813 Q499.3438,789.5 499.9688,788.9219 L499.9688,791.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="511" y="790.1543">A</text>
@@ -144,7 +144,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="82" x="528" y="779.1387">int,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="483" x2="607" y1="802" y2="802"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="483" x2="607" y1="810" y2="810"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="459" y="853"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0001119452495635561975" style="stroke: #A80036; stroke-width: 1.5;" width="172" x="459" y="853"/>
     <ellipse cx="474" cy="869" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M476.9688,874.6406 Q476.3906,874.9375 475.75,875.0781 Q475.1094,875.2344 474.4063,875.2344 Q471.9063,875.2344 470.5781,873.5938 Q469.2656,871.9375 469.2656,868.8125 Q469.2656,865.6875 470.5781,864.0313 Q471.9063,862.375 474.4063,862.375 Q475.1094,862.375 475.75,862.5313 Q476.4063,862.6875 476.9688,862.9844 L476.9688,865.7031 Q476.3438,865.125 475.75,864.8594 Q475.1563,864.5781 474.5313,864.5781 Q473.1875,864.5781 472.5,865.6563 Q471.8125,866.7188 471.8125,868.8125 Q471.8125,870.9063 472.5,871.9844 Q473.1875,873.0469 474.5313,873.0469 Q475.1563,873.0469 475.75,872.7813 Q476.3438,872.5 476.9688,871.9219 L476.9688,874.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="488" y="873.1543">A</text>
@@ -152,7 +152,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="128" x="505" y="862.1387">std::string,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="460" x2="630" y1="885" y2="885"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="460" x2="630" y1="893" y2="893"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000640294848489463071" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="476" y="936"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000640294848489463071" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="476" y="936"/>
     <ellipse cx="491" cy="952" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M493.9688,957.6406 Q493.3906,957.9375 492.75,958.0781 Q492.1094,958.2344 491.4063,958.2344 Q488.9063,958.2344 487.5781,956.5938 Q486.2656,954.9375 486.2656,951.8125 Q486.2656,948.6875 487.5781,947.0313 Q488.9063,945.375 491.4063,945.375 Q492.1094,945.375 492.75,945.5313 Q493.4063,945.6875 493.9688,945.9844 L493.9688,948.7031 Q493.3438,948.125 492.75,947.8594 Q492.1563,947.5781 491.5313,947.5781 Q490.1875,947.5781 489.5,948.6563 Q488.8125,949.7188 488.8125,951.8125 Q488.8125,953.9063 489.5,954.9844 Q490.1875,956.0469 491.5313,956.0469 Q492.1563,956.0469 492.75,955.7813 Q493.3438,955.5 493.9688,954.9219 L493.9688,957.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="505" y="956.1543">A</text>
@@ -160,7 +160,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="94" x="522" y="945.1387">char,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477" x2="613" y1="968" y2="968"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="477" x2="613" y1="976" y2="976"/>
-    <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="48" id="C_0000139599686499155694" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="465.5" y="687"/>
+    <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="48" id="C_0000139599686499155694" style="stroke: #A80036; stroke-width: 1.5;" width="159" x="465.5" y="687"/>
     <ellipse cx="480.5" cy="703" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M483.4688,708.6406 Q482.8906,708.9375 482.25,709.0781 Q481.6094,709.2344 480.9063,709.2344 Q478.4063,709.2344 477.0781,707.5938 Q475.7656,705.9375 475.7656,702.8125 Q475.7656,699.6875 477.0781,698.0313 Q478.4063,696.375 480.9063,696.375 Q481.6094,696.375 482.25,696.5313 Q482.9063,696.6875 483.4688,696.9844 L483.4688,699.7031 Q482.8438,699.125 482.25,698.8594 Q481.6563,698.5781 481.0313,698.5781 Q479.6875,698.5781 479,699.6563 Q478.3125,700.7188 478.3125,702.8125 Q478.3125,704.9063 479,705.9844 Q479.6875,707.0469 481.0313,707.0469 Q481.6563,707.0469 482.25,706.7813 Q482.8438,706.5 483.4688,705.9219 L483.4688,708.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="494.5" y="707.1543">A</text>
@@ -168,116 +168,116 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="115" x="511.5" y="696.1387">wchar_t,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="466.5" x2="623.5" y1="719" y2="719"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="466.5" x2="623.5" y1="727" y2="727"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1up9zsddt0xof)" height="240.0703" id="C_0001192822659863756768" style="stroke: #A80036; stroke-width: 1.5;" width="259" x="6" y="379"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L55" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L55" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f2zr0en7omx6y)" height="240.0703" id="C_0001192822659863756768" style="stroke: #A80036; stroke-width: 1.5;" width="259" x="6" y="379"/>
       <ellipse cx="127.25" cy="395" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M130.2188,400.6406 Q129.6406,400.9375 129,401.0781 Q128.3594,401.2344 127.6563,401.2344 Q125.1563,401.2344 123.8281,399.5938 Q122.5156,397.9375 122.5156,394.8125 Q122.5156,391.6875 123.8281,390.0313 Q125.1563,388.375 127.6563,388.375 Q128.3594,388.375 129,388.5313 Q129.6563,388.6875 130.2188,388.9844 L130.2188,391.7031 Q129.5938,391.125 129,390.8594 Q128.4063,390.5781 127.7813,390.5781 Q126.4375,390.5781 125.75,391.6563 Q125.0625,392.7188 125.0625,394.8125 Q125.0625,396.9063 125.75,397.9844 Q126.4375,399.0469 127.7813,399.0469 Q128.4063,399.0469 129,398.7813 Q129.5938,398.5 130.2188,397.9219 L130.2188,400.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="147.75" y="399.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="264" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="417"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="419"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L58" target="_top" title="bapair" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L58" xlink:show="new" xlink:title="bapair" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="149" x="26" y="425.2104">bapair : PairPairBA&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="429.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="431.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L60" target="_top" title="abool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L60" xlink:show="new" xlink:title="abool" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="26" y="438.0151">abool : APtr&lt;bool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="442.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="444.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L61" target="_top" title="aboolfloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L61" xlink:show="new" xlink:title="aboolfloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="169" x="26" y="450.8198">aboolfloat : AAPtr&lt;bool,float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="455.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="457.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L62" target="_top" title="afloat" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L62" xlink:show="new" xlink:title="afloat" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="26" y="463.6245">afloat : ASharedPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="468.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="470.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L63" target="_top" title="boolstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L63" xlink:show="new" xlink:title="boolstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="181" x="26" y="476.4292">boolstring : A&lt;bool,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="481.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="483.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L64" target="_top" title="floatstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L64" xlink:show="new" xlink:title="floatstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="26" y="489.2339">floatstring : AStringPtr&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="493.8281"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="495.8281"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L65" target="_top" title="intstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L65" xlink:show="new" xlink:title="intstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="26" y="502.0386">intstring : AIntString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="506.6328"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="508.6328"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L66" target="_top" title="stringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L66" xlink:show="new" xlink:title="stringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="26" y="514.8433">stringstring : AStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="519.4375"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="521.4375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L67" target="_top" title="bstringstring" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L67" xlink:show="new" xlink:title="bstringstring" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="26" y="527.6479">bstringstring : BStringString</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="532.2422"/>
       <polygon fill="none" points="17,532.2422,21,536.2422,17,540.2422,13,536.2422" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L70" target="_top" title="bs" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L70" xlink:show="new" xlink:title="bs" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="26" y="540.4526">bs : BVector</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="545.0469"/>
       <ellipse cx="17" cy="550.0469" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L73" target="_top" title="bs2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L73" xlink:show="new" xlink:title="bs2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="84" x="26" y="553.2573">bs2 : BVector2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="557.8516"/>
       <ellipse cx="17" cy="562.8516" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L74" target="_top" title="cb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L74" xlink:show="new" xlink:title="cb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="197" x="26" y="566.062">cb : SimpleCallback&lt;ACharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="570.6563"/>
       <ellipse cx="17" cy="575.6563" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L75" target="_top" title="gcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L75" xlink:show="new" xlink:title="gcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="233" x="26" y="578.8667">gcb : GenericCallback&lt;R::AWCharString&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="583.4609"/>
       <ellipse cx="17" cy="588.4609" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L76" target="_top" title="vcb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L76" xlink:show="new" xlink:title="vcb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="26" y="591.6714">vcb : VoidCallback</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="596.2656"/>
       <ellipse cx="17" cy="601.2656" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L77" target="_top" title="vps" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00014/t00014.cc#L77" xlink:show="new" xlink:title="vps" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="26" y="604.4761">vps : VectorPtr&lt;B&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="264" y1="611.0703" y2="611.0703"/>
diff --git a/docs/test_cases/t00015.md b/docs/test_cases/t00015.md
index 96fafa5b..e889e22b 100644
--- a/docs/test_cases/t00015.md
+++ b/docs/test_cases/t00015.md
@@ -49,3 +49,154 @@ class B : public ns1::ns2::Anon { };
 ```
 ## Generated UML diagrams
 ![t00015_class](./t00015_class.svg "Namespace fun")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00015::ns1::A",
+      "id": "1410694888805149453",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00015::ns1",
+      "source_location": {
+        "file": "../../tests/t00015/t00015.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00015::ns1::ns2_v0_9_0::A",
+      "id": "485552648049088863",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00015::ns1::ns2_v0_9_0",
+      "source_location": {
+        "file": "../../tests/t00015/t00015.cc",
+        "line": 10
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1410694888805149453",
+          "is_virtual": false,
+          "name": "clanguml::t00015::ns1::A"
+        }
+      ],
+      "display_name": "clanguml::t00015::ns1::Anon",
+      "id": "1060731132374575329",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Anon",
+      "namespace": "clanguml::t00015::ns1",
+      "source_location": {
+        "file": "../../tests/t00015/t00015.cc",
+        "line": 14
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1410694888805149453",
+          "is_virtual": false,
+          "name": "t00015::ns1::A"
+        }
+      ],
+      "display_name": "clanguml::t00015::ns3::ns1::ns2::Anon",
+      "id": "1797521288354158629",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Anon",
+      "namespace": "clanguml::t00015::ns3::ns1::ns2",
+      "source_location": {
+        "file": "../../tests/t00015/t00015.cc",
+        "line": 21
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1797521288354158629",
+          "is_virtual": false,
+          "name": "ns1::ns2::Anon"
+        }
+      ],
+      "display_name": "clanguml::t00015::ns3::B",
+      "id": "870882387819356092",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00015::ns3",
+      "source_location": {
+        "file": "../../tests/t00015/t00015.cc",
+        "line": 24
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00015_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1410694888805149453",
+      "source": "1060731132374575329",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1410694888805149453",
+      "source": "1797521288354158629",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1797521288354158629",
+      "source": "870882387819356092",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00015"
+}
+```
diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg
index aceec1bf..b62eecb8 100644
--- a/docs/test_cases/t00015_class.svg
+++ b/docs/test_cases/t00015_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:365px;height:283px;" version="1.1" viewBox="0 0 365 283" width="365px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbzxop93l1rrx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1tz5509yetz82" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbzxop93l1rrx)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tz5509yetz82)" height="48" id="C_0001410694888805149453" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="98" y="8"/>
       <ellipse cx="113" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,29.6406 Q115.3906,29.9375 114.75,30.0781 Q114.1094,30.2344 113.4063,30.2344 Q110.9063,30.2344 109.5781,28.5938 Q108.2656,26.9375 108.2656,23.8125 Q108.2656,20.6875 109.5781,19.0313 Q110.9063,17.375 113.4063,17.375 Q114.1094,17.375 114.75,17.5313 Q115.4063,17.6875 115.9688,17.9844 L115.9688,20.7031 Q115.3438,20.125 114.75,19.8594 Q114.1563,19.5781 113.5313,19.5781 Q112.1875,19.5781 111.5,20.6563 Q110.8125,21.7188 110.8125,23.8125 Q110.8125,25.9063 111.5,26.9844 Q112.1875,28.0469 113.5313,28.0469 Q114.1563,28.0469 114.75,27.7813 Q115.3438,27.5 115.9688,26.9219 L115.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="127" y="28.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="168" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbzxop93l1rrx)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tz5509yetz82)" height="48" id="C_0000485552648049088863" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="204.5" y="8"/>
       <ellipse cx="219.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.4688,29.6406 Q221.8906,29.9375 221.25,30.0781 Q220.6094,30.2344 219.9063,30.2344 Q217.4063,30.2344 216.0781,28.5938 Q214.7656,26.9375 214.7656,23.8125 Q214.7656,20.6875 216.0781,19.0313 Q217.4063,17.375 219.9063,17.375 Q220.6094,17.375 221.25,17.5313 Q221.9063,17.6875 222.4688,17.9844 L222.4688,20.7031 Q221.8438,20.125 221.25,19.8594 Q220.6563,19.5781 220.0313,19.5781 Q218.6875,19.5781 218,20.6563 Q217.3125,21.7188 217.3125,23.8125 Q217.3125,25.9063 218,26.9844 Q218.6875,28.0469 220.0313,28.0469 Q220.6563,28.0469 221.25,27.7813 Q221.8438,27.5 222.4688,26.9219 L222.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="233.5" y="28.1543">ns1::ns2_v0_9_0::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205.5" x2="353.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbzxop93l1rrx)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L14" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L14" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tz5509yetz82)" height="48" id="C_0001060731132374575329" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="35" y="136.1543">ns1::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="100" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbzxop93l1rrx)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L21" target="_top" title="Anon" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L21" xlink:show="new" xlink:title="Anon" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tz5509yetz82)" height="48" id="C_0001797521288354158629" style="stroke: #A80036; stroke-width: 1.5;" width="157" x="136" y="116"/>
       <ellipse cx="151" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M153.9688,137.6406 Q153.3906,137.9375 152.75,138.0781 Q152.1094,138.2344 151.4063,138.2344 Q148.9063,138.2344 147.5781,136.5938 Q146.2656,134.9375 146.2656,131.8125 Q146.2656,128.6875 147.5781,127.0313 Q148.9063,125.375 151.4063,125.375 Q152.1094,125.375 152.75,125.5313 Q153.4063,125.6875 153.9688,125.9844 L153.9688,128.7031 Q153.3438,128.125 152.75,127.8594 Q152.1563,127.5781 151.5313,127.5781 Q150.1875,127.5781 149.5,128.6563 Q148.8125,129.7188 148.8125,131.8125 Q148.8125,133.9063 149.5,134.9844 Q150.1875,136.0469 151.5313,136.0469 Q152.1563,136.0469 152.75,135.7813 Q153.3438,135.5 153.9688,134.9219 L153.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="125" x="165" y="136.1543">ns3::ns1::ns2::Anon</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="292" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbzxop93l1rrx)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L24" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00015/t00015.cc#L24" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tz5509yetz82)" height="48" id="C_0000870882387819356092" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="179" y="224"/>
       <ellipse cx="194" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,245.6406 Q196.3906,245.9375 195.75,246.0781 Q195.1094,246.2344 194.4063,246.2344 Q191.9063,246.2344 190.5781,244.5938 Q189.2656,242.9375 189.2656,239.8125 Q189.2656,236.6875 190.5781,235.0313 Q191.9063,233.375 194.4063,233.375 Q195.1094,233.375 195.75,233.5313 Q196.4063,233.6875 196.9688,233.9844 L196.9688,236.7031 Q196.3438,236.125 195.75,235.8594 Q195.1563,235.5781 194.5313,235.5781 Q193.1875,235.5781 192.5,236.6563 Q191.8125,237.7188 191.8125,239.8125 Q191.8125,241.9063 192.5,242.9844 Q193.1875,244.0469 194.5313,244.0469 Q195.1563,244.0469 195.75,243.7813 Q196.3438,243.5 196.9688,242.9219 L196.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="208" y="244.1543">ns3::B</text>
diff --git a/docs/test_cases/t00016.md b/docs/test_cases/t00016.md
index 74dfed28..39c12c24 100644
--- a/docs/test_cases/t00016.md
+++ b/docs/test_cases/t00016.md
@@ -50,3 +50,213 @@ template <> struct is_numeric<bool> {
 ```
 ## Generated UML diagrams
 ![t00016_class](./t00016_class.svg "Unnamed enums and empty templates")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00016::is_numeric<>",
+      "id": "214045147845616983",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "value",
+          "type": "enum"
+        }
+      ],
+      "methods": [],
+      "name": "is_numeric",
+      "namespace": "clanguml::t00016",
+      "source_location": {
+        "file": "../../tests/t00016/t00016.cc",
+        "line": 4
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00016::is_numeric<float>",
+      "id": "95618295648274199",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "is_numeric",
+      "namespace": "clanguml::t00016",
+      "source_location": {
+        "file": "../../tests/t00016/t00016.cc",
+        "line": 8
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "float"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00016::is_numeric<char>",
+      "id": "979129381790761728",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "is_numeric",
+      "namespace": "clanguml::t00016",
+      "source_location": {
+        "file": "../../tests/t00016/t00016.cc",
+        "line": 12
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "char"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00016::is_numeric<unsigned int>",
+      "id": "2090787690027341836",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "is_numeric",
+      "namespace": "clanguml::t00016",
+      "source_location": {
+        "file": "../../tests/t00016/t00016.cc",
+        "line": 16
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "unsigned int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00016::is_numeric<int>",
+      "id": "500603075237446075",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "is_numeric",
+      "namespace": "clanguml::t00016",
+      "source_location": {
+        "file": "../../tests/t00016/t00016.cc",
+        "line": 20
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00016::is_numeric<bool>",
+      "id": "2111316837513419920",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "is_numeric",
+      "namespace": "clanguml::t00016",
+      "source_location": {
+        "file": "../../tests/t00016/t00016.cc",
+        "line": 24
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "bool"
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00016_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "214045147845616983",
+      "source": "95618295648274199",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "214045147845616983",
+      "source": "979129381790761728",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "214045147845616983",
+      "source": "2090787690027341836",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "214045147845616983",
+      "source": "500603075237446075",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "214045147845616983",
+      "source": "2111316837513419920",
+      "type": "instantiation"
+    }
+  ],
+  "using_namespace": "clanguml::t00016"
+}
+```
diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg
index 1e3195b3..3b9f2aa4 100644
--- a/docs/test_cases/t00016_class.svg
+++ b/docs/test_cases/t00016_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="187px" preserveAspectRatio="none" style="width:847px;height:187px;" version="1.1" viewBox="0 0 847 187" width="847px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1bxtocfrbg7kc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fuqshmi9gzsj0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bxtocfrbg7kc)" height="60.8047" id="C_0000214045147845616983" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="367" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L4" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L4" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqshmi9gzsj0)" height="60.8047" id="C_0000214045147845616983" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="367" y="116"/>
       <ellipse cx="382" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M384.9688,137.6406 Q384.3906,137.9375 383.75,138.0781 Q383.1094,138.2344 382.4063,138.2344 Q379.9063,138.2344 378.5781,136.5938 Q377.2656,134.9375 377.2656,131.8125 Q377.2656,128.6875 378.5781,127.0313 Q379.9063,125.375 382.4063,125.375 Q383.1094,125.375 383.75,125.5313 Q384.4063,125.6875 384.9688,125.9844 L384.9688,128.7031 Q384.3438,128.125 383.75,127.8594 Q383.1563,127.5781 382.5313,127.5781 Q381.1875,127.5781 380.5,128.6563 Q379.8125,129.7188 379.8125,131.8125 Q379.8125,133.9063 380.5,134.9844 Q381.1875,136.0469 382.5313,136.0469 Q383.1563,136.0469 383.75,135.7813 Q384.3438,135.5 384.9688,134.9219 L384.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="396" y="136.1543">is_numeric&lt;&gt;</text>
@@ -19,8 +19,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="74" x="387" y="162.2104">value : enum</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368" x2="484" y1="168.8047" y2="168.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bxtocfrbg7kc)" height="48" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L8" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L8" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqshmi9gzsj0)" height="48" id="C_0000095618295648274199" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="35" y="28.1543">is_numeric</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="135" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bxtocfrbg7kc)" height="48" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L12" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L12" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqshmi9gzsj0)" height="48" id="C_0000979129381790761728" style="stroke: #A80036; stroke-width: 1.5;" width="130" x="171" y="8"/>
       <ellipse cx="186" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.9688,29.6406 Q188.3906,29.9375 187.75,30.0781 Q187.1094,30.2344 186.4063,30.2344 Q183.9063,30.2344 182.5781,28.5938 Q181.2656,26.9375 181.2656,23.8125 Q181.2656,20.6875 182.5781,19.0313 Q183.9063,17.375 186.4063,17.375 Q187.1094,17.375 187.75,17.5313 Q188.4063,17.6875 188.9688,17.9844 L188.9688,20.7031 Q188.3438,20.125 187.75,19.8594 Q187.1563,19.5781 186.5313,19.5781 Q185.1875,19.5781 184.5,20.6563 Q183.8125,21.7188 183.8125,23.8125 Q183.8125,25.9063 184.5,26.9844 Q185.1875,28.0469 186.5313,28.0469 Q187.1563,28.0469 187.75,27.7813 Q188.3438,27.5 188.9688,26.9219 L188.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="200" y="28.1543">is_numeric</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="172" x2="300" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="172" x2="300" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bxtocfrbg7kc)" height="48" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L16" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L16" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqshmi9gzsj0)" height="48" id="C_0002090787690027341836" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="336.5" y="8"/>
       <ellipse cx="351.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M354.4688,29.6406 Q353.8906,29.9375 353.25,30.0781 Q352.6094,30.2344 351.9063,30.2344 Q349.4063,30.2344 348.0781,28.5938 Q346.7656,26.9375 346.7656,23.8125 Q346.7656,20.6875 348.0781,19.0313 Q349.4063,17.375 351.9063,17.375 Q352.6094,17.375 353.25,17.5313 Q353.9063,17.6875 354.4688,17.9844 L354.4688,20.7031 Q353.8438,20.125 353.25,19.8594 Q352.6563,19.5781 352.0313,19.5781 Q350.6875,19.5781 350,20.6563 Q349.3125,21.7188 349.3125,23.8125 Q349.3125,25.9063 350,26.9844 Q350.6875,28.0469 352.0313,28.0469 Q352.6563,28.0469 353.25,27.7813 Q353.8438,27.5 354.4688,26.9219 L354.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="365.5" y="28.1543">is_numeric</text>
@@ -49,8 +49,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="514.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="337.5" x2="514.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bxtocfrbg7kc)" height="48" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L20" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L20" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqshmi9gzsj0)" height="48" id="C_0000500603075237446075" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="551" y="8"/>
       <ellipse cx="566" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M568.9688,29.6406 Q568.3906,29.9375 567.75,30.0781 Q567.1094,30.2344 566.4063,30.2344 Q563.9063,30.2344 562.5781,28.5938 Q561.2656,26.9375 561.2656,23.8125 Q561.2656,20.6875 562.5781,19.0313 Q563.9063,17.375 566.4063,17.375 Q567.1094,17.375 567.75,17.5313 Q568.4063,17.6875 568.9688,17.9844 L568.9688,20.7031 Q568.3438,20.125 567.75,19.8594 Q567.1563,19.5781 566.5313,19.5781 Q565.1875,19.5781 564.5,20.6563 Q563.8125,21.7188 563.8125,23.8125 Q563.8125,25.9063 564.5,26.9844 Q565.1875,28.0469 566.5313,28.0469 Q567.1563,28.0469 567.75,27.7813 Q568.3438,27.5 568.9688,26.9219 L568.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="580" y="28.1543">is_numeric</text>
@@ -59,8 +59,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="552" x2="668" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="552" x2="668" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1bxtocfrbg7kc)" height="48" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L24" target="_top" title="is_numeric" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00016/t00016.cc#L24" xlink:show="new" xlink:title="is_numeric" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fuqshmi9gzsj0)" height="48" id="C_0002111316837513419920" style="stroke: #A80036; stroke-width: 1.5;" width="129" x="704.5" y="8"/>
       <ellipse cx="719.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M722.4688,29.6406 Q721.8906,29.9375 721.25,30.0781 Q720.6094,30.2344 719.9063,30.2344 Q717.4063,30.2344 716.0781,28.5938 Q714.7656,26.9375 714.7656,23.8125 Q714.7656,20.6875 716.0781,19.0313 Q717.4063,17.375 719.9063,17.375 Q720.6094,17.375 721.25,17.5313 Q721.9063,17.6875 722.4688,17.9844 L722.4688,20.7031 Q721.8438,20.125 721.25,19.8594 Q720.6563,19.5781 720.0313,19.5781 Q718.6875,19.5781 718,20.6563 Q717.3125,21.7188 717.3125,23.8125 Q717.3125,25.9063 718,26.9844 Q718.6875,28.0469 720.0313,28.0469 Q720.6563,28.0469 721.25,27.7813 Q721.8438,27.5 722.4688,26.9219 L722.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="733.5" y="28.1543">is_numeric</text>
diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md
index b5dc2913..338ff12e 100644
--- a/docs/test_cases/t00017.md
+++ b/docs/test_cases/t00017.md
@@ -78,3 +78,541 @@ private:
 ```
 ## Generated UML diagrams
 ![t00017_class](./t00017_class.svg "Test include relations also as members flag")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::A",
+      "id": "121332093434690887",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 5
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::B",
+      "id": "1424864837456200487",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::C",
+      "id": "2151170391844743478",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::D",
+      "id": "1378112127131766972",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::E",
+      "id": "1535300935831802489",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::F",
+      "id": "1803800465279710134",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 15
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::G",
+      "id": "1135797791892670246",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::H",
+      "id": "1243547836571712317",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "H",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 19
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::I",
+      "id": "387733199705628658",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "I",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 21
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::J",
+      "id": "747991828672433537",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "J",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 23
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::K",
+      "id": "1783571342994833467",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "K",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 25
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00017::R",
+      "id": "287495916564113342",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "some_int",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 38
+          },
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "some_int_pointer",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 39
+          },
+          "type": "int *"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "some_int_pointer_pointer",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 40
+          },
+          "type": "int **"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "some_int_reference",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 41
+          },
+          "type": "int &"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 42
+          },
+          "type": "clanguml::t00017::A"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 43
+          },
+          "type": "clanguml::t00017::B *"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 44
+          },
+          "type": "clanguml::t00017::C &"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "d",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 45
+          },
+          "type": "const clanguml::t00017::D *"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "e",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 46
+          },
+          "type": "const clanguml::t00017::E &"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "f",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 47
+          },
+          "type": "clanguml::t00017::F &&"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "g",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 48
+          },
+          "type": "clanguml::t00017::G **"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "h",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 49
+          },
+          "type": "clanguml::t00017::H ***"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "i",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 50
+          },
+          "type": "clanguml::t00017::I *&"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "j",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 51
+          },
+          "type": "volatile clanguml::t00017::J *"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "k",
+          "source_location": {
+            "file": "../../tests/t00017/t00017.cc",
+            "line": 52
+          },
+          "type": "clanguml::t00017::K *"
+        }
+      ],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "R",
+          "parameters": [
+            {
+              "name": "some_int",
+              "type": "int &"
+            },
+            {
+              "name": "cc",
+              "type": "clanguml::t00017::C &"
+            },
+            {
+              "name": "ee",
+              "type": "const clanguml::t00017::E &"
+            },
+            {
+              "name": "ff",
+              "type": "clanguml::t00017::F &&"
+            },
+            {
+              "name": "ii",
+              "type": "clanguml::t00017::I *&"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "R",
+      "namespace": "clanguml::t00017",
+      "source_location": {
+        "file": "../../tests/t00017/t00017.cc",
+        "line": 27
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00017_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2151170391844743478",
+      "source": "287495916564113342",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1535300935831802489",
+      "source": "287495916564113342",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1803800465279710134",
+      "source": "287495916564113342",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "387733199705628658",
+      "source": "287495916564113342",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "121332093434690887",
+      "label": "a",
+      "source": "287495916564113342",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1424864837456200487",
+      "label": "b",
+      "source": "287495916564113342",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "2151170391844743478",
+      "label": "c",
+      "source": "287495916564113342",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "1378112127131766972",
+      "label": "d",
+      "source": "287495916564113342",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "1535300935831802489",
+      "label": "e",
+      "source": "287495916564113342",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "1803800465279710134",
+      "label": "f",
+      "source": "287495916564113342",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1135797791892670246",
+      "label": "g",
+      "source": "287495916564113342",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "1243547836571712317",
+      "label": "h",
+      "source": "287495916564113342",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "387733199705628658",
+      "label": "i",
+      "source": "287495916564113342",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "747991828672433537",
+      "label": "j",
+      "source": "287495916564113342",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "1783571342994833467",
+      "label": "k",
+      "source": "287495916564113342",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00017"
+}
+```
diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg
index 3aa8f097..1e558c9c 100644
--- a/docs/test_cases/t00017_class.svg
+++ b/docs/test_cases/t00017_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:799px;height:256px;" version="1.1" viewBox="0 0 799 256" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fhxsg84j4wxca" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f165esijs3lob2" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,127 +9,127 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0000121332093434690887" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L7" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L7" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0001424864837456200487" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="197"/>
       <ellipse cx="96" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,218.6406 Q98.3906,218.9375 97.75,219.0781 Q97.1094,219.2344 96.4063,219.2344 Q93.9063,219.2344 92.5781,217.5938 Q91.2656,215.9375 91.2656,212.8125 Q91.2656,209.6875 92.5781,208.0313 Q93.9063,206.375 96.4063,206.375 Q97.1094,206.375 97.75,206.5313 Q98.4063,206.6875 98.9688,206.9844 L98.9688,209.7031 Q98.3438,209.125 97.75,208.8594 Q97.1563,208.5781 96.5313,208.5781 Q95.1875,208.5781 94.5,209.6563 Q93.8125,210.7188 93.8125,212.8125 Q93.8125,214.9063 94.5,215.9844 Q95.1875,217.0469 96.5313,217.0469 Q97.1563,217.0469 97.75,216.7813 Q98.3438,216.5 98.9688,215.9219 L98.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L9" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L9" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0002151170391844743478" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="197"/>
       <ellipse cx="171" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,218.6406 Q173.3906,218.9375 172.75,219.0781 Q172.1094,219.2344 171.4063,219.2344 Q168.9063,219.2344 167.5781,217.5938 Q166.2656,215.9375 166.2656,212.8125 Q166.2656,209.6875 167.5781,208.0313 Q168.9063,206.375 171.4063,206.375 Q172.1094,206.375 172.75,206.5313 Q173.4063,206.6875 173.9688,206.9844 L173.9688,209.7031 Q173.3438,209.125 172.75,208.8594 Q172.1563,208.5781 171.5313,208.5781 Q170.1875,208.5781 169.5,209.6563 Q168.8125,210.7188 168.8125,212.8125 Q168.8125,214.9063 169.5,215.9844 Q170.1875,217.0469 171.5313,217.0469 Q172.1563,217.0469 172.75,216.7813 Q173.3438,216.5 173.9688,215.9219 L173.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L11" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L11" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0001378112127131766972" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="197"/>
       <ellipse cx="246.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,218.6406 Q248.8906,218.9375 248.25,219.0781 Q247.6094,219.2344 246.9063,219.2344 Q244.4063,219.2344 243.0781,217.5938 Q241.7656,215.9375 241.7656,212.8125 Q241.7656,209.6875 243.0781,208.0313 Q244.4063,206.375 246.9063,206.375 Q247.6094,206.375 248.25,206.5313 Q248.9063,206.6875 249.4688,206.9844 L249.4688,209.7031 Q248.8438,209.125 248.25,208.8594 Q247.6563,208.5781 247.0313,208.5781 Q245.6875,208.5781 245,209.6563 Q244.3125,210.7188 244.3125,212.8125 Q244.3125,214.9063 245,215.9844 Q245.6875,217.0469 247.0313,217.0469 Q247.6563,217.0469 248.25,216.7813 Q248.8438,216.5 249.4688,215.9219 L249.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L13" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L13" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0001535300935831802489" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="308" y="197"/>
       <ellipse cx="323" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.9688,218.6406 Q325.3906,218.9375 324.75,219.0781 Q324.1094,219.2344 323.4063,219.2344 Q320.9063,219.2344 319.5781,217.5938 Q318.2656,215.9375 318.2656,212.8125 Q318.2656,209.6875 319.5781,208.0313 Q320.9063,206.375 323.4063,206.375 Q324.1094,206.375 324.75,206.5313 Q325.4063,206.6875 325.9688,206.9844 L325.9688,209.7031 Q325.3438,209.125 324.75,208.8594 Q324.1563,208.5781 323.5313,208.5781 Q322.1875,208.5781 321.5,209.6563 Q320.8125,210.7188 320.8125,212.8125 Q320.8125,214.9063 321.5,215.9844 Q322.1875,217.0469 323.5313,217.0469 Q324.1563,217.0469 324.75,216.7813 Q325.3438,216.5 325.9688,215.9219 L325.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="337" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="309" x2="347" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L15" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L15" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0001803800465279710134" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="383.5" y="197"/>
       <ellipse cx="398.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.4688,218.6406 Q400.8906,218.9375 400.25,219.0781 Q399.6094,219.2344 398.9063,219.2344 Q396.4063,219.2344 395.0781,217.5938 Q393.7656,215.9375 393.7656,212.8125 Q393.7656,209.6875 395.0781,208.0313 Q396.4063,206.375 398.9063,206.375 Q399.6094,206.375 400.25,206.5313 Q400.9063,206.6875 401.4688,206.9844 L401.4688,209.7031 Q400.8438,209.125 400.25,208.8594 Q399.6563,208.5781 399.0313,208.5781 Q397.6875,208.5781 397,209.6563 Q396.3125,210.7188 396.3125,212.8125 Q396.3125,214.9063 397,215.9844 Q397.6875,217.0469 399.0313,217.0469 Q399.6563,217.0469 400.25,216.7813 Q400.8438,216.5 401.4688,215.9219 L401.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="412.5" y="217.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="384.5" x2="421.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0001135797791892670246" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="457.5" y="197"/>
       <ellipse cx="472.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M475.4688,218.6406 Q474.8906,218.9375 474.25,219.0781 Q473.6094,219.2344 472.9063,219.2344 Q470.4063,219.2344 469.0781,217.5938 Q467.7656,215.9375 467.7656,212.8125 Q467.7656,209.6875 469.0781,208.0313 Q470.4063,206.375 472.9063,206.375 Q473.6094,206.375 474.25,206.5313 Q474.9063,206.6875 475.4688,206.9844 L475.4688,209.7031 Q474.8438,209.125 474.25,208.8594 Q473.6563,208.5781 473.0313,208.5781 Q471.6875,208.5781 471,209.6563 Q470.3125,210.7188 470.3125,212.8125 Q470.3125,214.9063 471,215.9844 Q471.6875,217.0469 473.0313,217.0469 Q473.6563,217.0469 474.25,216.7813 Q474.8438,216.5 475.4688,215.9219 L475.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="486.5" y="217.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="458.5" x2="497.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L19" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L19" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0001243547836571712317" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="533.5" y="197"/>
       <ellipse cx="548.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.4688,218.6406 Q550.8906,218.9375 550.25,219.0781 Q549.6094,219.2344 548.9063,219.2344 Q546.4063,219.2344 545.0781,217.5938 Q543.7656,215.9375 543.7656,212.8125 Q543.7656,209.6875 545.0781,208.0313 Q546.4063,206.375 548.9063,206.375 Q549.6094,206.375 550.25,206.5313 Q550.9063,206.6875 551.4688,206.9844 L551.4688,209.7031 Q550.8438,209.125 550.25,208.8594 Q549.6563,208.5781 549.0313,208.5781 Q547.6875,208.5781 547,209.6563 Q546.3125,210.7188 546.3125,212.8125 Q546.3125,214.9063 547,215.9844 Q547.6875,217.0469 549.0313,217.0469 Q549.6563,217.0469 550.25,216.7813 Q550.8438,216.5 551.4688,215.9219 L551.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="562.5" y="217.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="534.5" x2="573.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L21" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L21" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0000387733199705628658" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="609.5" y="197"/>
       <ellipse cx="624.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M627.4688,218.6406 Q626.8906,218.9375 626.25,219.0781 Q625.6094,219.2344 624.9063,219.2344 Q622.4063,219.2344 621.0781,217.5938 Q619.7656,215.9375 619.7656,212.8125 Q619.7656,209.6875 621.0781,208.0313 Q622.4063,206.375 624.9063,206.375 Q625.6094,206.375 626.25,206.5313 Q626.9063,206.6875 627.4688,206.9844 L627.4688,209.7031 Q626.8438,209.125 626.25,208.8594 Q625.6563,208.5781 625.0313,208.5781 Q623.6875,208.5781 623,209.6563 Q622.3125,210.7188 622.3125,212.8125 Q622.3125,214.9063 623,215.9844 Q623.6875,217.0469 625.0313,217.0469 Q625.6563,217.0469 626.25,216.7813 Q626.8438,216.5 627.4688,215.9219 L627.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="638.5" y="217.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="610.5" x2="643.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L23" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L23" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0000747991828672433537" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="679.5" y="197"/>
       <ellipse cx="694.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M697.4688,218.6406 Q696.8906,218.9375 696.25,219.0781 Q695.6094,219.2344 694.9063,219.2344 Q692.4063,219.2344 691.0781,217.5938 Q689.7656,215.9375 689.7656,212.8125 Q689.7656,209.6875 691.0781,208.0313 Q692.4063,206.375 694.9063,206.375 Q695.6094,206.375 696.25,206.5313 Q696.9063,206.6875 697.4688,206.9844 L697.4688,209.7031 Q696.8438,209.125 696.25,208.8594 Q695.6563,208.5781 695.0313,208.5781 Q693.6875,208.5781 693,209.6563 Q692.3125,210.7188 692.3125,212.8125 Q692.3125,214.9063 693,215.9844 Q693.6875,217.0469 695.0313,217.0469 Q695.6563,217.0469 696.25,216.7813 Q696.8438,216.5 697.4688,215.9219 L697.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="708.5" y="217.1543">J</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="680.5" x2="713.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L25" target="_top" title="K" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L25" xlink:show="new" xlink:title="K" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="48" id="C_0001783571342994833467" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="749.5" y="197"/>
       <ellipse cx="764.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M767.4688,218.6406 Q766.8906,218.9375 766.25,219.0781 Q765.6094,219.2344 764.9063,219.2344 Q762.4063,219.2344 761.0781,217.5938 Q759.7656,215.9375 759.7656,212.8125 Q759.7656,209.6875 761.0781,208.0313 Q762.4063,206.375 764.9063,206.375 Q765.6094,206.375 766.25,206.5313 Q766.9063,206.6875 767.4688,206.9844 L767.4688,209.7031 Q766.8438,209.125 766.25,208.8594 Q765.6563,208.5781 765.0313,208.5781 Q763.6875,208.5781 763,209.6563 Q762.3125,210.7188 762.3125,212.8125 Q762.3125,214.9063 763,215.9844 Q763.6875,217.0469 765.0313,217.0469 Q765.6563,217.0469 766.25,216.7813 Q766.8438,216.5 767.4688,215.9219 L767.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="778.5" y="217.1543">K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="750.5" x2="787.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fhxsg84j4wxca)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="196.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L27" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L27" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f165esijs3lob2)" height="112.0234" id="C_0000287495916564113342" style="stroke: #A80036; stroke-width: 1.5;" width="379" x="196.5" y="8"/>
       <ellipse cx="377.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M380.7188,29.6406 Q380.1406,29.9375 379.5,30.0781 Q378.8594,30.2344 378.1563,30.2344 Q375.6563,30.2344 374.3281,28.5938 Q373.0156,26.9375 373.0156,23.8125 Q373.0156,20.6875 374.3281,19.0313 Q375.6563,17.375 378.1563,17.375 Q378.8594,17.375 379.5,17.5313 Q380.1563,17.6875 380.7188,17.9844 L380.7188,20.7031 Q380.0938,20.125 379.5,19.8594 Q378.9063,19.5781 378.2813,19.5781 Q376.9375,19.5781 376.25,20.6563 Q375.5625,21.7188 375.5625,23.8125 Q375.5625,25.9063 376.25,26.9844 Q376.9375,28.0469 378.2813,28.0469 Q378.9063,28.0469 379.5,27.7813 Q380.0938,27.5 380.7188,26.9219 L380.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="398.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="197.5" x2="574.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L38" target="_top" title="some_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L38" xlink:show="new" xlink:title="some_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="216.5" y="54.2104">some_int : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L39" target="_top" title="some_int_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L39" xlink:show="new" xlink:title="some_int_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="216.5" y="67.0151">some_int_pointer : int *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L40" target="_top" title="some_int_pointer_pointer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L40" xlink:show="new" xlink:title="some_int_pointer_pointer" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="186" x="216.5" y="79.8198">some_int_pointer_pointer : int **</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="202.5" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="204.5" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L41" target="_top" title="some_int_reference" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00017/t00017.cc#L41" xlink:show="new" xlink:title="some_int_reference" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="216.5" y="92.6245">some_int_reference : int &amp;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="197.5" x2="574.5" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md
index b8880439..a10f4112 100644
--- a/docs/test_cases/t00018.md
+++ b/docs/test_cases/t00018.md
@@ -135,3 +135,276 @@ void widget::draw(const clanguml::t00018::widget &w)
 ```
 ## Generated UML diagrams
 ![t00018_class](./t00018_class.svg "Pimpl pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00018::impl::widget",
+      "id": "130502639682787993",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "n",
+          "source_location": {
+            "file": "../../tests/t00018/t00018_impl.h",
+            "line": 10
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "draw",
+          "parameters": [
+            {
+              "name": "w",
+              "type": "const clanguml::t00018::widget &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "draw",
+          "parameters": [
+            {
+              "name": "w",
+              "type": "const clanguml::t00018::widget &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "widget",
+          "parameters": [
+            {
+              "name": "n",
+              "type": "int"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "widget",
+      "namespace": "clanguml::t00018::impl",
+      "source_location": {
+        "file": "../../tests/t00018/t00018_impl.h",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00018::widget",
+      "id": "1005661284373854088",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "pImpl",
+          "source_location": {
+            "file": "../../tests/t00018/t00018.h",
+            "line": 18
+          },
+          "type": "std::unique_ptr<impl::widget>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "draw",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "draw",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "shown",
+          "parameters": [],
+          "type": "bool"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "widget",
+          "parameters": [
+            {
+              "name": "",
+              "type": "int"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "~widget",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "widget",
+          "parameters": [
+            {
+              "name": "",
+              "type": "clanguml::t00018::widget &&"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "widget",
+          "parameters": [
+            {
+              "name": "",
+              "type": "const clanguml::t00018::widget &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "operator=",
+          "parameters": [
+            {
+              "name": "",
+              "type": "clanguml::t00018::widget &&"
+            }
+          ],
+          "type": "clanguml::t00018::widget &"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "operator=",
+          "parameters": [
+            {
+              "name": "",
+              "type": "const clanguml::t00018::widget &"
+            }
+          ],
+          "type": "clanguml::t00018::widget &"
+        }
+      ],
+      "name": "widget",
+      "namespace": "clanguml::t00018",
+      "source_location": {
+        "file": "../../tests/t00018/t00018.h",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00018_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1005661284373854088",
+      "source": "130502639682787993",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "130502639682787993",
+      "label": "pImpl",
+      "source": "1005661284373854088",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00018"
+}
+```
diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg
index c2f5fa62..807dc8c1 100644
--- a/docs/test_cases/t00018_class.svg
+++ b/docs/test_cases/t00018_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="371px" preserveAspectRatio="none" style="width:262px;height:371px;" version="1.1" viewBox="0 0 262 371" width="262px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1n0qsad7n3lzj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1jst0g1ii3oat" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,18 +9,18 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1n0qsad7n3lzj)" height="99.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="13" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018_impl.h#L9" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018_impl.h#L9" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jst0g1ii3oat)" height="99.2188" id="C_0000130502639682787993" style="stroke: #A80036; stroke-width: 1.5;" width="231" x="13" y="8"/>
       <ellipse cx="87.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M90.2188,29.6406 Q89.6406,29.9375 89,30.0781 Q88.3594,30.2344 87.6563,30.2344 Q85.1563,30.2344 83.8281,28.5938 Q82.5156,26.9375 82.5156,23.8125 Q82.5156,20.6875 83.8281,19.0313 Q85.1563,17.375 87.6563,17.375 Q88.3594,17.375 89,17.5313 Q89.6563,17.6875 90.2188,17.9844 L90.2188,20.7031 Q89.5938,20.125 89,19.8594 Q88.4063,19.5781 87.7813,19.5781 Q86.4375,19.5781 85.75,20.6563 Q85.0625,21.7188 85.0625,23.8125 Q85.0625,25.9063 85.75,26.9844 Q86.4375,28.0469 87.7813,28.0469 Q88.4063,28.0469 89,27.7813 Q89.5938,27.5 90.2188,26.9219 L90.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="107.75" y="28.1543">impl::widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="243" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="21" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018_impl.h#L10" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018_impl.h#L10" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="33" y="54.2104">n : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="243" y1="60.8047" y2="60.8047"/>
@@ -30,18 +30,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="170" x="33" y="87.8198">draw(const widget &amp; w) : void</text>
     <ellipse cx="24" cy="97.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="33" y="100.6245">widget(int n) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1n0qsad7n3lzj)" height="176.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018.h#L17" target="_top" title="widget" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018.h#L17" xlink:show="new" xlink:title="widget" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jst0g1ii3oat)" height="176.0469" id="C_0001005661284373854088" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="6" y="184"/>
       <ellipse cx="103.75" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M106.7188,205.6406 Q106.1406,205.9375 105.5,206.0781 Q104.8594,206.2344 104.1563,206.2344 Q101.6563,206.2344 100.3281,204.5938 Q99.0156,202.9375 99.0156,199.8125 Q99.0156,196.6875 100.3281,195.0313 Q101.6563,193.375 104.1563,193.375 Q104.8594,193.375 105.5,193.5313 Q106.1563,193.6875 106.7188,193.9844 L106.7188,196.7031 Q106.0938,196.125 105.5,195.8594 Q104.9063,195.5781 104.2813,195.5781 Q102.9375,195.5781 102.25,196.6563 Q101.5625,197.7188 101.5625,199.8125 Q101.5625,201.9063 102.25,202.9844 Q102.9375,204.0469 104.2813,204.0469 Q104.9063,204.0469 105.5,203.7813 Q106.0938,203.5 106.7188,202.9219 L106.7188,205.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="124.25" y="204.1543">widget</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="216" y2="216"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="222"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="224"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018.h#L18" target="_top" title="pImpl" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00018/t00018.h#L18" xlink:show="new" xlink:title="pImpl" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="216" x="26" y="230.2104">pImpl : std::unique_ptr&lt;impl::widget&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="250" y1="236.8047" y2="236.8047"/>
diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md
index 846f5c6b..9491757b 100644
--- a/docs/test_cases/t00019.md
+++ b/docs/test_cases/t00019.md
@@ -152,3 +152,482 @@ class Base {
 ```
 ## Generated UML diagrams
 ![t00019_class](./t00019_class.svg "Layercake pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00019::Base",
+      "id": "261668487476634123",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "Base",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~Base",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m1",
+          "parameters": [],
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m2",
+          "parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "name": "Base",
+      "namespace": "clanguml::t00019",
+      "source_location": {
+        "file": "../../tests/t00019/t00019_base.h",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00019::Layer1<LowerLayer>",
+      "id": "902631298537519271",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m1",
+          "parameters": [],
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m2",
+          "parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "name": "Layer1",
+      "namespace": "clanguml::t00019",
+      "source_location": {
+        "file": "../../tests/t00019/t00019_layer1.h",
+        "line": 9
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "LowerLayer",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00019::Layer2<LowerLayer>",
+      "id": "1115150925302580647",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "all_calls_count",
+          "parameters": [],
+          "type": "int"
+        }
+      ],
+      "name": "Layer2",
+      "namespace": "clanguml::t00019",
+      "source_location": {
+        "file": "../../tests/t00019/t00019_layer2.h",
+        "line": 6
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "LowerLayer",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00019::Layer3<LowerLayer>",
+      "id": "1853410560073854945",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "m_m1_calls",
+          "source_location": {
+            "file": "../../tests/t00019/t00019_layer3.h",
+            "line": 29
+          },
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "m_m2_calls",
+          "source_location": {
+            "file": "../../tests/t00019/t00019_layer3.h",
+            "line": 30
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m1",
+          "parameters": [],
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m2",
+          "parameters": [],
+          "type": "std::string"
+        },
+        {
+          "access": "private",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m1_calls",
+          "parameters": [],
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m2_calls",
+          "parameters": [],
+          "type": "int"
+        }
+      ],
+      "name": "Layer3",
+      "namespace": "clanguml::t00019",
+      "source_location": {
+        "file": "../../tests/t00019/t00019_layer3.h",
+        "line": 8
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "LowerLayer",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "261668487476634123",
+          "is_virtual": false,
+          "name": "clanguml::t00019::Base"
+        }
+      ],
+      "display_name": "clanguml::t00019::Layer3<clanguml::t00019::Base>",
+      "id": "972890420743280319",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Layer3",
+      "namespace": "clanguml::t00019",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00019::Base"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "972890420743280319",
+          "is_virtual": false,
+          "name": "clanguml::t00019::Layer3<clanguml::t00019::Base>"
+        }
+      ],
+      "display_name": "clanguml::t00019::Layer2<clanguml::t00019::Layer3<clanguml::t00019::Base>>",
+      "id": "129784999866998870",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Layer2",
+      "namespace": "clanguml::t00019",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "clanguml::t00019::Base"
+            }
+          ],
+          "type": "clanguml::t00019::Layer3"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "129784999866998870",
+          "is_virtual": false,
+          "name": "clanguml::t00019::Layer2<clanguml::t00019::Layer3<clanguml::t00019::Base>>"
+        }
+      ],
+      "display_name": "clanguml::t00019::Layer1<clanguml::t00019::Layer2<clanguml::t00019::Layer3<clanguml::t00019::Base>>>",
+      "id": "659076058325663708",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Layer1",
+      "namespace": "clanguml::t00019",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "argument",
+                  "template_parameters": [],
+                  "type": "clanguml::t00019::Base"
+                }
+              ],
+              "type": "clanguml::t00019::Layer3"
+            }
+          ],
+          "type": "clanguml::t00019::Layer2"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00019::A",
+      "id": "1015164998787089197",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "layers",
+          "source_location": {
+            "file": "../../tests/t00019/t00019.cc",
+            "line": 13
+          },
+          "type": "std::unique_ptr<Layer1<Layer2<Layer3<Base>>>>"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00019",
+      "source_location": {
+        "file": "../../tests/t00019/t00019.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00019_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "261668487476634123",
+      "source": "972890420743280319",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1853410560073854945",
+      "source": "972890420743280319",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "261668487476634123",
+      "source": "972890420743280319",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "972890420743280319",
+      "source": "129784999866998870",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1115150925302580647",
+      "source": "129784999866998870",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "972890420743280319",
+      "source": "129784999866998870",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "129784999866998870",
+      "source": "659076058325663708",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "902631298537519271",
+      "source": "659076058325663708",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "129784999866998870",
+      "source": "659076058325663708",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "659076058325663708",
+      "source": "1015164998787089197",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "659076058325663708",
+      "label": "layers",
+      "source": "1015164998787089197",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00019"
+}
+```
diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg
index fb79a242..9c24a0d2 100644
--- a/docs/test_cases/t00019_class.svg
+++ b/docs/test_cases/t00019_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="685px" preserveAspectRatio="none" style="width:781px;height:685px;" version="1.1" viewBox="0 0 781 685" width="781px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ftcyv0gqesw53" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1vz3cgxn3jtc1" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftcyv0gqesw53)" height="99.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="163" x="194.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_base.h#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_base.h#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vz3cgxn3jtc1)" height="99.2188" id="C_0000261668487476634123" style="stroke: #A80036; stroke-width: 1.5;" width="163" x="194.5" y="8"/>
       <ellipse cx="256.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.2188,29.6406 Q258.6406,29.9375 258,30.0781 Q257.3594,30.2344 256.6563,30.2344 Q254.1563,30.2344 252.8281,28.5938 Q251.5156,26.9375 251.5156,23.8125 Q251.5156,20.6875 252.8281,19.0313 Q254.1563,17.375 256.6563,17.375 Q257.3594,17.375 258,17.5313 Q258.6563,17.6875 259.2188,17.9844 L259.2188,20.7031 Q258.5938,20.125 258,19.8594 Q257.4063,19.5781 256.7813,19.5781 Q255.4375,19.5781 254.75,20.6563 Q254.0625,21.7188 254.0625,23.8125 Q254.0625,25.9063 254.75,26.9844 Q255.4375,28.0469 256.7813,28.0469 Q257.4063,28.0469 258,27.7813 Q258.5938,27.5 259.2188,26.9219 L259.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="276.75" y="28.1543">Base</text>
@@ -25,8 +25,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="202.5" y="94.4141"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="214.5" y="100.6245">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftcyv0gqesw53)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="443" y="601"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer1.h#L9" target="_top" title="Layer1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer1.h#L9" xlink:show="new" xlink:title="Layer1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vz3cgxn3jtc1)" height="73.6094" id="C_0000902631298537519271" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="443" y="601"/>
       <ellipse cx="458" cy="617" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M460.9688,622.6406 Q460.3906,622.9375 459.75,623.0781 Q459.1094,623.2344 458.4063,623.2344 Q455.9063,623.2344 454.5781,621.5938 Q453.2656,619.9375 453.2656,616.8125 Q453.2656,613.6875 454.5781,612.0313 Q455.9063,610.375 458.4063,610.375 Q459.1094,610.375 459.75,610.5313 Q460.4063,610.6875 460.9688,610.9844 L460.9688,613.7031 Q460.3438,613.125 459.75,612.8594 Q459.1563,612.5781 458.5313,612.5781 Q457.1875,612.5781 456.5,613.6563 Q455.8125,614.7188 455.8125,616.8125 Q455.8125,618.9063 456.5,619.9844 Q457.1875,621.0469 458.5313,621.0469 Q459.1563,621.0469 459.75,620.7813 Q460.3438,620.5 460.9688,619.9219 L460.9688,622.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="472" y="621.1543">Layer1</text>
@@ -39,8 +39,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="451" y="661.8047"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="463" y="668.0151">m2() : std::string</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftcyv0gqesw53)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="187.5" y="479"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer2.h#L6" target="_top" title="Layer2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer2.h#L6" xlink:show="new" xlink:title="Layer2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vz3cgxn3jtc1)" height="60.8047" id="C_0001115150925302580647" style="stroke: #A80036; stroke-width: 1.5;" width="177" x="187.5" y="479"/>
       <ellipse cx="214.65" cy="495" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M217.6188,500.6406 Q217.0406,500.9375 216.4,501.0781 Q215.7594,501.2344 215.0563,501.2344 Q212.5563,501.2344 211.2281,499.5938 Q209.9156,497.9375 209.9156,494.8125 Q209.9156,491.6875 211.2281,490.0313 Q212.5563,488.375 215.0563,488.375 Q215.7594,488.375 216.4,488.5313 Q217.0563,488.6875 217.6188,488.9844 L217.6188,491.7031 Q216.9938,491.125 216.4,490.8594 Q215.8063,490.5781 215.1813,490.5781 Q213.8375,490.5781 213.15,491.6563 Q212.4625,492.7188 212.4625,494.8125 Q212.4625,496.9063 213.15,497.9844 Q213.8375,499.0469 215.1813,499.0469 Q215.8063,499.0469 216.4,498.7813 Q216.9938,498.5 217.6188,497.9219 L217.6188,500.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="231.35" y="499.1543">Layer2</text>
@@ -51,8 +51,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="195.5" y="527"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="151" x="207.5" y="533.2104">all_calls_count() const : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftcyv0gqesw53)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="6" y="277"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L8" target="_top" title="Layer3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L8" xlink:show="new" xlink:title="Layer3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vz3cgxn3jtc1)" height="124.8281" id="C_0001853410560073854945" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="6" y="277"/>
       <ellipse cx="21" cy="293" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,298.6406 Q23.3906,298.9375 22.75,299.0781 Q22.1094,299.2344 21.4063,299.2344 Q18.9063,299.2344 17.5781,297.5938 Q16.2656,295.9375 16.2656,292.8125 Q16.2656,289.6875 17.5781,288.0313 Q18.9063,286.375 21.4063,286.375 Q22.1094,286.375 22.75,286.5313 Q23.4063,286.6875 23.9688,286.9844 L23.9688,289.7031 Q23.3438,289.125 22.75,288.8594 Q22.1563,288.5781 21.5313,288.5781 Q20.1875,288.5781 19.5,289.6563 Q18.8125,290.7188 18.8125,292.8125 Q18.8125,294.9063 19.5,295.9844 Q20.1875,297.0469 21.5313,297.0469 Q22.1563,297.0469 22.75,296.7813 Q23.3438,296.5 23.9688,295.9219 L23.9688,298.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="35" y="297.1543">Layer3</text>
@@ -60,18 +60,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="73" x="85" y="286.1387">LowerLayer</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="155" y1="309" y2="309"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="315"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="317"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L29" target="_top" title="m_m1_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L29" xlink:show="new" xlink:title="m_m1_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="323.2104">m_m1_calls : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="327.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="329.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L30" target="_top" title="m_m2_calls" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019_layer3.h#L30" xlink:show="new" xlink:title="m_m2_calls" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="336.0151">m_m2_calls : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="155" y1="342.6094" y2="342.6094"/>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="26" y="382.4292">m1_calls() const : int</text>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="389.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="119" x="26" y="395.2339">m2_calls() const : int</text>
-    <rect fill="#FEFECE" filter="url(#ftcyv0gqesw53)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="222.5" y="168"/>
+    <rect fill="#FEFECE" filter="url(#f1vz3cgxn3jtc1)" height="48" id="C_0000972890420743280319" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="222.5" y="168"/>
     <ellipse cx="237.5" cy="184" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M240.4688,189.6406 Q239.8906,189.9375 239.25,190.0781 Q238.6094,190.2344 237.9063,190.2344 Q235.4063,190.2344 234.0781,188.5938 Q232.7656,186.9375 232.7656,183.8125 Q232.7656,180.6875 234.0781,179.0313 Q235.4063,177.375 237.9063,177.375 Q238.6094,177.375 239.25,177.5313 Q239.9063,177.6875 240.4688,177.9844 L240.4688,180.7031 Q239.8438,180.125 239.25,179.8594 Q238.6563,179.5781 238.0313,179.5781 Q236.6875,179.5781 236,180.6563 Q235.3125,181.7188 235.3125,183.8125 Q235.3125,185.9063 236,186.9844 Q236.6875,188.0469 238.0313,188.0469 Q238.6563,188.0469 239.25,187.7813 Q239.8438,187.5 240.4688,186.9219 L240.4688,189.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="251.5" y="188.1543">Layer3</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="301.5" y="177.1387">Base</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="223.5" x2="328.5" y1="200" y2="200"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="223.5" x2="328.5" y1="208" y2="208"/>
-    <rect fill="#FEFECE" filter="url(#ftcyv0gqesw53)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="315.5"/>
+    <rect fill="#FEFECE" filter="url(#f1vz3cgxn3jtc1)" height="48" id="C_0000129784999866998870" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="191" y="315.5"/>
     <ellipse cx="206" cy="331.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M208.9688,337.1406 Q208.3906,337.4375 207.75,337.5781 Q207.1094,337.7344 206.4063,337.7344 Q203.9063,337.7344 202.5781,336.0938 Q201.2656,334.4375 201.2656,331.3125 Q201.2656,328.1875 202.5781,326.5313 Q203.9063,324.875 206.4063,324.875 Q207.1094,324.875 207.75,325.0313 Q208.4063,325.1875 208.9688,325.4844 L208.9688,328.2031 Q208.3438,327.625 207.75,327.3594 Q207.1563,327.0781 206.5313,327.0781 Q205.1875,327.0781 204.5,328.1563 Q203.8125,329.2188 203.8125,331.3125 Q203.8125,333.4063 204.5,334.4844 Q205.1875,335.5469 206.5313,335.5469 Q207.1563,335.5469 207.75,335.2813 Q208.3438,335 208.9688,334.4219 L208.9688,337.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="220" y="335.6543">Layer2</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="270" y="324.6387">Layer3&lt;Base&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="192" x2="360" y1="347.5" y2="347.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="192" x2="360" y1="355.5" y2="355.5"/>
-    <rect fill="#FEFECE" filter="url(#ftcyv0gqesw53)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="401.5" y="485.5"/>
+    <rect fill="#FEFECE" filter="url(#f1vz3cgxn3jtc1)" height="48" id="C_0000659076058325663708" style="stroke: #A80036; stroke-width: 1.5;" width="233" x="401.5" y="485.5"/>
     <ellipse cx="416.5" cy="501.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M419.4688,507.1406 Q418.8906,507.4375 418.25,507.5781 Q417.6094,507.7344 416.9063,507.7344 Q414.4063,507.7344 413.0781,506.0938 Q411.7656,504.4375 411.7656,501.3125 Q411.7656,498.1875 413.0781,496.5313 Q414.4063,494.875 416.9063,494.875 Q417.6094,494.875 418.25,495.0313 Q418.9063,495.1875 419.4688,495.4844 L419.4688,498.2031 Q418.8438,497.625 418.25,497.3594 Q417.6563,497.0781 417.0313,497.0781 Q415.6875,497.0781 415,498.1563 Q414.3125,499.2188 414.3125,501.3125 Q414.3125,503.4063 415,504.4844 Q415.6875,505.5469 417.0313,505.5469 Q417.6563,505.5469 418.25,505.2813 Q418.8438,505 419.4688,504.4219 L419.4688,507.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="41" x="430.5" y="505.6543">Layer1</text>
@@ -107,18 +107,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="156" x="480.5" y="494.6387">Layer2&lt;Layer3&lt;Base&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="402.5" x2="633.5" y1="517.5" y2="517.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="402.5" x2="633.5" y1="525.5" y2="525.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftcyv0gqesw53)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="396" y="309"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1vz3cgxn3jtc1)" height="60.8047" id="C_0001015164998787089197" style="stroke: #A80036; stroke-width: 1.5;" width="374" x="396" y="309"/>
       <ellipse cx="574.75" cy="325" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M577.7188,330.6406 Q577.1406,330.9375 576.5,331.0781 Q575.8594,331.2344 575.1563,331.2344 Q572.6563,331.2344 571.3281,329.5938 Q570.0156,327.9375 570.0156,324.8125 Q570.0156,321.6875 571.3281,320.0313 Q572.6563,318.375 575.1563,318.375 Q575.8594,318.375 576.5,318.5313 Q577.1563,318.6875 577.7188,318.9844 L577.7188,321.7031 Q577.0938,321.125 576.5,320.8594 Q575.9063,320.5781 575.2813,320.5781 Q573.9375,320.5781 573.25,321.6563 Q572.5625,322.7188 572.5625,324.8125 Q572.5625,326.9063 573.25,327.9844 Q573.9375,329.0469 575.2813,329.0469 Q575.9063,329.0469 576.5,328.7813 Q577.0938,328.5 577.7188,327.9219 L577.7188,330.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="595.25" y="329.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="397" x2="769" y1="341" y2="341"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="402" y="347"/>
       <ellipse cx="407" cy="352" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019.cc#L13" target="_top" title="layers" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00019/t00019.cc#L13" xlink:show="new" xlink:title="layers" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="348" x="416" y="355.2104">layers : std::unique_ptr&lt;Layer1&lt;Layer2&lt;Layer3&lt;Base&gt;&gt;&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="397" x2="769" y1="361.8047" y2="361.8047"/>
diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md
index 462db2a6..3a2425a2 100644
--- a/docs/test_cases/t00020.md
+++ b/docs/test_cases/t00020.md
@@ -98,3 +98,516 @@ public:
 ```
 ## Generated UML diagrams
 ![t00020_class](./t00020_class.svg "Abstract factory pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00020::ProductA",
+      "id": "425267229659464944",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~ProductA",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "sell",
+          "parameters": [
+            {
+              "name": "price",
+              "type": "int"
+            }
+          ],
+          "type": "bool"
+        }
+      ],
+      "name": "ProductA",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "425267229659464944",
+          "is_virtual": false,
+          "name": "clanguml::t00020::ProductA"
+        }
+      ],
+      "display_name": "clanguml::t00020::ProductA1",
+      "id": "1756496029797864207",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "sell",
+          "parameters": [
+            {
+              "name": "price",
+              "type": "int"
+            }
+          ],
+          "type": "bool"
+        }
+      ],
+      "name": "ProductA1",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 12
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "425267229659464944",
+          "is_virtual": false,
+          "name": "clanguml::t00020::ProductA"
+        }
+      ],
+      "display_name": "clanguml::t00020::ProductA2",
+      "id": "1531708592885216981",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "sell",
+          "parameters": [
+            {
+              "name": "price",
+              "type": "int"
+            }
+          ],
+          "type": "bool"
+        }
+      ],
+      "name": "ProductA2",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00020::ProductB",
+      "id": "2235759006374865842",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~ProductB",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "buy",
+          "parameters": [
+            {
+              "name": "price",
+              "type": "int"
+            }
+          ],
+          "type": "bool"
+        }
+      ],
+      "name": "ProductB",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2235759006374865842",
+          "is_virtual": false,
+          "name": "clanguml::t00020::ProductB"
+        }
+      ],
+      "display_name": "clanguml::t00020::ProductB1",
+      "id": "1465493024233223845",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "buy",
+          "parameters": [
+            {
+              "name": "price",
+              "type": "int"
+            }
+          ],
+          "type": "bool"
+        }
+      ],
+      "name": "ProductB1",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 28
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2235759006374865842",
+          "is_virtual": false,
+          "name": "clanguml::t00020::ProductB"
+        }
+      ],
+      "display_name": "clanguml::t00020::ProductB2",
+      "id": "2154665562370057871",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "buy",
+          "parameters": [
+            {
+              "name": "price",
+              "type": "int"
+            }
+          ],
+          "type": "bool"
+        }
+      ],
+      "name": "ProductB2",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 33
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00020::AbstractFactory",
+      "id": "1705546469218961425",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "make_a",
+          "parameters": [],
+          "type": "std::unique_ptr<ProductA>"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "make_b",
+          "parameters": [],
+          "type": "std::unique_ptr<ProductB>"
+        }
+      ],
+      "name": "AbstractFactory",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 38
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1705546469218961425",
+          "is_virtual": false,
+          "name": "clanguml::t00020::AbstractFactory"
+        }
+      ],
+      "display_name": "clanguml::t00020::Factory1",
+      "id": "692346848484854107",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "make_a",
+          "parameters": [],
+          "type": "std::unique_ptr<ProductA>"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "make_b",
+          "parameters": [],
+          "type": "std::unique_ptr<ProductB>"
+        }
+      ],
+      "name": "Factory1",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 44
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1705546469218961425",
+          "is_virtual": false,
+          "name": "clanguml::t00020::AbstractFactory"
+        }
+      ],
+      "display_name": "clanguml::t00020::Factory2",
+      "id": "1566325870805013023",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "make_a",
+          "parameters": [],
+          "type": "std::unique_ptr<ProductA>"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "make_b",
+          "parameters": [],
+          "type": "std::unique_ptr<ProductB>"
+        }
+      ],
+      "name": "Factory2",
+      "namespace": "clanguml::t00020",
+      "source_location": {
+        "file": "../../tests/t00020/t00020.cc",
+        "line": 57
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00020_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "425267229659464944",
+      "source": "1756496029797864207",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "425267229659464944",
+      "source": "1531708592885216981",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2235759006374865842",
+      "source": "1465493024233223845",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2235759006374865842",
+      "source": "2154665562370057871",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "425267229659464944",
+      "source": "1705546469218961425",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2235759006374865842",
+      "source": "1705546469218961425",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "425267229659464944",
+      "source": "692346848484854107",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2235759006374865842",
+      "source": "692346848484854107",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1705546469218961425",
+      "source": "692346848484854107",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "425267229659464944",
+      "source": "1566325870805013023",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2235759006374865842",
+      "source": "1566325870805013023",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1705546469218961425",
+      "source": "1566325870805013023",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00020"
+}
+```
diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg
index 8d0285cf..2b37a08a 100644
--- a/docs/test_cases/t00020_class.svg
+++ b/docs/test_cases/t00020_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="870px" preserveAspectRatio="none" style="width:754px;height:870px;" version="1.1" viewBox="0 0 754 870" width="754px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fjbxesygyogzj" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fta4fn7ew4jkc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="73.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="297.33" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L6" target="_top" title="ProductA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L6" xlink:show="new" xlink:title="ProductA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="73.6094" id="C_0000425267229659464944" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="297.33" y="142"/>
       <ellipse cx="361.58" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.6894,153.3438 L360.5331,158.4219 L362.8613,158.4219 L361.6894,153.3438 Z M360.205,151.1094 L363.1894,151.1094 L366.5488,163.5 L364.0956,163.5 L363.33,160.4375 L360.0488,160.4375 L359.2988,163.5 L356.8613,163.5 L360.205,151.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="382.08" y="162.1543">ProductA</text>
@@ -21,8 +21,8 @@
       <ellipse cx="308.33" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="167" x="317.33" y="209.0151">sell(int price) const = 0 : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="169.33" y="276"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L12" target="_top" title="ProductA1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L12" xlink:show="new" xlink:title="ProductA1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="60.8047" id="C_0001756496029797864207" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="169.33" y="276"/>
       <ellipse cx="218.08" cy="292" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M221.0488,297.6406 Q220.4706,297.9375 219.83,298.0781 Q219.1894,298.2344 218.4863,298.2344 Q215.9863,298.2344 214.6581,296.5938 Q213.3456,294.9375 213.3456,291.8125 Q213.3456,288.6875 214.6581,287.0313 Q215.9863,285.375 218.4863,285.375 Q219.1894,285.375 219.83,285.5313 Q220.4863,285.6875 221.0488,285.9844 L221.0488,288.7031 Q220.4238,288.125 219.83,287.8594 Q219.2363,287.5781 218.6113,287.5781 Q217.2675,287.5781 216.58,288.6563 Q215.8925,289.7188 215.8925,291.8125 Q215.8925,293.9063 216.58,294.9844 Q217.2675,296.0469 218.6113,296.0469 Q219.2363,296.0469 219.83,295.7813 Q220.4238,295.5 221.0488,294.9219 L221.0488,297.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="238.58" y="296.1543">ProductA1</text>
@@ -31,8 +31,8 @@
       <ellipse cx="180.33" cy="327" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="189.33" y="330.2104">sell(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="518.33" y="403.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L17" target="_top" title="ProductA2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L17" xlink:show="new" xlink:title="ProductA2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="60.8047" id="C_0001531708592885216981" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="518.33" y="403.5"/>
       <ellipse cx="567.08" cy="419.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M570.0488,425.1406 Q569.4706,425.4375 568.83,425.5781 Q568.1894,425.7344 567.4863,425.7344 Q564.9863,425.7344 563.6581,424.0938 Q562.3456,422.4375 562.3456,419.3125 Q562.3456,416.1875 563.6581,414.5313 Q564.9863,412.875 567.4863,412.875 Q568.1894,412.875 568.83,413.0313 Q569.4863,413.1875 570.0488,413.4844 L570.0488,416.2031 Q569.4238,415.625 568.83,415.3594 Q568.2363,415.0781 567.6113,415.0781 Q566.2675,415.0781 565.58,416.1563 Q564.8925,417.2188 564.8925,419.3125 Q564.8925,421.4063 565.58,422.4844 Q566.2675,423.5469 567.6113,423.5469 Q568.2363,423.5469 568.83,423.2813 Q569.4238,423 570.0488,422.4219 L570.0488,425.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="587.58" y="423.6543">ProductA2</text>
@@ -41,8 +41,8 @@
       <ellipse cx="529.33" cy="454.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="538.33" y="457.7104">sell(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="73.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="22.33" y="531"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L22" target="_top" title="ProductB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L22" xlink:show="new" xlink:title="ProductB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="73.6094" id="C_0002235759006374865842" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="22.33" y="531"/>
       <ellipse cx="87.58" cy="547" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M87.6894,542.3438 L86.5331,547.4219 L88.8613,547.4219 L87.6894,542.3438 Z M86.205,540.1094 L89.1894,540.1094 L92.5488,552.5 L90.0956,552.5 L89.33,549.4375 L86.0488,549.4375 L85.2988,552.5 L82.8613,552.5 L86.205,540.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="108.08" y="551.1543">ProductB</text>
@@ -53,8 +53,8 @@
       <ellipse cx="33.33" cy="594.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="169" x="42.33" y="598.0151">buy(int price) const = 0 : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="240.33" y="665"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L28" target="_top" title="ProductB1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L28" xlink:show="new" xlink:title="ProductB1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="60.8047" id="C_0001465493024233223845" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="240.33" y="665"/>
       <ellipse cx="289.08" cy="681" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M292.0488,686.6406 Q291.4706,686.9375 290.83,687.0781 Q290.1894,687.2344 289.4863,687.2344 Q286.9863,687.2344 285.6581,685.5938 Q284.3456,683.9375 284.3456,680.8125 Q284.3456,677.6875 285.6581,676.0313 Q286.9863,674.375 289.4863,674.375 Q290.1894,674.375 290.83,674.5313 Q291.4863,674.6875 292.0488,674.9844 L292.0488,677.7031 Q291.4238,677.125 290.83,676.8594 Q290.2363,676.5781 289.6113,676.5781 Q288.2675,676.5781 287.58,677.6563 Q286.8925,678.7188 286.8925,680.8125 Q286.8925,682.9063 287.58,683.9844 Q288.2675,685.0469 289.6113,685.0469 Q290.2363,685.0469 290.83,684.7813 Q291.4238,684.5 292.0488,683.9219 L292.0488,686.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="309.58" y="685.1543">ProductB1</text>
@@ -63,8 +63,8 @@
       <ellipse cx="251.33" cy="716" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="260.33" y="719.2104">buy(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="34.33" y="665"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L33" target="_top" title="ProductB2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L33" xlink:show="new" xlink:title="ProductB2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="60.8047" id="C_0002154665562370057871" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="34.33" y="665"/>
       <ellipse cx="83.08" cy="681" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M86.0488,686.6406 Q85.4706,686.9375 84.83,687.0781 Q84.1894,687.2344 83.4863,687.2344 Q80.9863,687.2344 79.6581,685.5938 Q78.3456,683.9375 78.3456,680.8125 Q78.3456,677.6875 79.6581,676.0313 Q80.9863,674.375 83.4863,674.375 Q84.1894,674.375 84.83,674.5313 Q85.4863,674.6875 86.0488,674.9844 L86.0488,677.7031 Q85.4238,677.125 84.83,676.8594 Q84.2363,676.5781 83.6113,676.5781 Q82.2675,676.5781 81.58,677.6563 Q80.8925,678.7188 80.8925,680.8125 Q80.8925,682.9063 81.58,683.9844 Q82.2675,685.0469 83.6113,685.0469 Q84.2363,685.0469 84.83,684.7813 Q85.4238,684.5 86.0488,683.9219 L86.0488,686.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="65" x="103.58" y="685.1543">ProductB2</text>
@@ -73,8 +73,8 @@
       <ellipse cx="45.33" cy="716" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="54.33" y="719.2104">buy(int price) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="103.83" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L38" target="_top" title="AbstractFactory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L38" xlink:show="new" xlink:title="AbstractFactory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="73.6094" id="C_0001705546469218961425" style="stroke: #A80036; stroke-width: 1.5;" width="302" x="103.83" y="8"/>
       <ellipse cx="201.08" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M201.1894,19.3438 L200.0331,24.4219 L202.3612,24.4219 L201.1894,19.3438 Z M199.705,17.1094 L202.6894,17.1094 L206.0487,29.5 L203.5956,29.5 L202.83,26.4375 L199.5487,26.4375 L198.7987,29.5 L196.3612,29.5 L199.705,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="99" x="221.58" y="28.1543">AbstractFactory</text>
@@ -85,8 +85,8 @@
       <ellipse cx="114.83" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="276" x="123.83" y="75.0151">make_b() const = 0 : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="114.83" y="397"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L44" target="_top" title="Factory1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L44" xlink:show="new" xlink:title="Factory1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="73.6094" id="C_0000692346848484854107" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="114.83" y="397"/>
       <ellipse cx="223.58" cy="413" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M226.5487,418.6406 Q225.9706,418.9375 225.33,419.0781 Q224.6894,419.2344 223.9862,419.2344 Q221.4862,419.2344 220.1581,417.5938 Q218.8456,415.9375 218.8456,412.8125 Q218.8456,409.6875 220.1581,408.0313 Q221.4862,406.375 223.9862,406.375 Q224.6894,406.375 225.33,406.5313 Q225.9862,406.6875 226.5487,406.9844 L226.5487,409.7031 Q225.9237,409.125 225.33,408.8594 Q224.7362,408.5781 224.1112,408.5781 Q222.7675,408.5781 222.08,409.6563 Q221.3925,410.7188 221.3925,412.8125 Q221.3925,414.9063 222.08,415.9844 Q222.7675,417.0469 224.1112,417.0469 Q224.7362,417.0469 225.33,416.7813 Q225.9237,416.5 226.5487,415.9219 L226.5487,418.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="244.08" y="417.1543">Factory1</text>
@@ -97,8 +97,8 @@
       <ellipse cx="125.83" cy="460.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="254" x="134.83" y="464.0151">make_b() const : std::unique_ptr&lt;ProductB&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fjbxesygyogzj)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="324.83" y="786"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L57" target="_top" title="Factory2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00020/t00020.cc#L57" xlink:show="new" xlink:title="Factory2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fta4fn7ew4jkc)" height="73.6094" id="C_0001566325870805013023" style="stroke: #A80036; stroke-width: 1.5;" width="280" x="324.83" y="786"/>
       <ellipse cx="433.58" cy="802" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M436.5488,807.6406 Q435.9706,807.9375 435.33,808.0781 Q434.6894,808.2344 433.9863,808.2344 Q431.4863,808.2344 430.1581,806.5938 Q428.8456,804.9375 428.8456,801.8125 Q428.8456,798.6875 430.1581,797.0313 Q431.4863,795.375 433.9863,795.375 Q434.6894,795.375 435.33,795.5313 Q435.9863,795.6875 436.5488,795.9844 L436.5488,798.7031 Q435.9238,798.125 435.33,797.8594 Q434.7363,797.5781 434.1113,797.5781 Q432.7675,797.5781 432.08,798.6563 Q431.3925,799.7188 431.3925,801.8125 Q431.3925,803.9063 432.08,804.9844 Q432.7675,806.0469 434.1113,806.0469 Q434.7363,806.0469 435.33,805.7813 Q435.9238,805.5 436.5488,804.9219 L436.5488,807.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="54" x="454.08" y="806.1543">Factory2</text>
diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md
index 0d431d17..b9a2038d 100644
--- a/docs/test_cases/t00021.md
+++ b/docs/test_cases/t00021.md
@@ -72,3 +72,504 @@ public:
 ```
 ## Generated UML diagrams
 ![t00021_class](./t00021_class.svg "Visitor pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00021::Visitor",
+      "id": "1668671110672744395",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~Visitor",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "visit_A",
+          "parameters": [
+            {
+              "name": "item",
+              "type": "const clanguml::t00021::A &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "visit_B",
+          "parameters": [
+            {
+              "name": "item",
+              "type": "const clanguml::t00021::B &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "Visitor",
+      "namespace": "clanguml::t00021",
+      "source_location": {
+        "file": "../../tests/t00021/t00021.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1668671110672744395",
+          "is_virtual": false,
+          "name": "clanguml::t00021::Visitor"
+        }
+      ],
+      "display_name": "clanguml::t00021::Visitor1",
+      "id": "1028369219400401946",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "visit_A",
+          "parameters": [
+            {
+              "name": "item",
+              "type": "const clanguml::t00021::A &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "visit_B",
+          "parameters": [
+            {
+              "name": "item",
+              "type": "const clanguml::t00021::B &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "Visitor1",
+      "namespace": "clanguml::t00021",
+      "source_location": {
+        "file": "../../tests/t00021/t00021.cc",
+        "line": 16
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1668671110672744395",
+          "is_virtual": false,
+          "name": "clanguml::t00021::Visitor"
+        }
+      ],
+      "display_name": "clanguml::t00021::Visitor2",
+      "id": "1710373315476287130",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "visit_A",
+          "parameters": [
+            {
+              "name": "item",
+              "type": "const clanguml::t00021::A &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "visit_B",
+          "parameters": [
+            {
+              "name": "item",
+              "type": "const clanguml::t00021::B &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "Visitor2",
+      "namespace": "clanguml::t00021",
+      "source_location": {
+        "file": "../../tests/t00021/t00021.cc",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1668671110672744395",
+          "is_virtual": false,
+          "name": "clanguml::t00021::Visitor"
+        }
+      ],
+      "display_name": "clanguml::t00021::Visitor3",
+      "id": "1399026228179178025",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "visit_A",
+          "parameters": [
+            {
+              "name": "item",
+              "type": "const clanguml::t00021::A &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "visit_B",
+          "parameters": [
+            {
+              "name": "item",
+              "type": "const clanguml::t00021::B &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "Visitor3",
+      "namespace": "clanguml::t00021",
+      "source_location": {
+        "file": "../../tests/t00021/t00021.cc",
+        "line": 28
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00021::Item",
+      "id": "1491568826758947722",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~Item",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "accept",
+          "parameters": [
+            {
+              "name": "visitor",
+              "type": "const clanguml::t00021::Visitor &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "Item",
+      "namespace": "clanguml::t00021",
+      "source_location": {
+        "file": "../../tests/t00021/t00021.cc",
+        "line": 34
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1491568826758947722",
+          "is_virtual": false,
+          "name": "clanguml::t00021::Item"
+        }
+      ],
+      "display_name": "clanguml::t00021::A",
+      "id": "1494142745564026823",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "accept",
+          "parameters": [
+            {
+              "name": "visitor",
+              "type": "const clanguml::t00021::Visitor &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00021",
+      "source_location": {
+        "file": "../../tests/t00021/t00021.cc",
+        "line": 40
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1491568826758947722",
+          "is_virtual": false,
+          "name": "clanguml::t00021::Item"
+        }
+      ],
+      "display_name": "clanguml::t00021::B",
+      "id": "1452948650450999568",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "accept",
+          "parameters": [
+            {
+              "name": "visitor",
+              "type": "const clanguml::t00021::Visitor &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "B",
+      "namespace": "clanguml::t00021",
+      "source_location": {
+        "file": "../../tests/t00021/t00021.cc",
+        "line": 45
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00021_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1494142745564026823",
+      "source": "1668671110672744395",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1452948650450999568",
+      "source": "1668671110672744395",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1494142745564026823",
+      "source": "1028369219400401946",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1452948650450999568",
+      "source": "1028369219400401946",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1668671110672744395",
+      "source": "1028369219400401946",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1494142745564026823",
+      "source": "1710373315476287130",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1452948650450999568",
+      "source": "1710373315476287130",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1668671110672744395",
+      "source": "1710373315476287130",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1494142745564026823",
+      "source": "1399026228179178025",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1452948650450999568",
+      "source": "1399026228179178025",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1668671110672744395",
+      "source": "1399026228179178025",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1668671110672744395",
+      "source": "1491568826758947722",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1668671110672744395",
+      "source": "1494142745564026823",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1491568826758947722",
+      "source": "1494142745564026823",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1668671110672744395",
+      "source": "1452948650450999568",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1491568826758947722",
+      "source": "1452948650450999568",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00021"
+}
+```
diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg
index 4aaa781f..a51a7eb4 100644
--- a/docs/test_cases/t00021_class.svg
+++ b/docs/test_cases/t00021_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:990px;height:493px;" version="1.1" viewBox="0 0 990 493" width="990px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fm3isnjpd0jd6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1gu6y3kzoagab" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm3isnjpd0jd6)" height="86.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L9" target="_top" title="Visitor" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L9" xlink:show="new" xlink:title="Visitor" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gu6y3kzoagab)" height="86.4141" id="C_0001668671110672744395" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="368" y="142"/>
       <ellipse cx="469.25" cy="158" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.3594,153.3438 L468.2031,158.4219 L470.5313,158.4219 L469.3594,153.3438 Z M467.875,151.1094 L470.8594,151.1094 L474.2188,163.5 L471.7656,163.5 L471,160.4375 L467.7188,160.4375 L466.9688,163.5 L464.5313,163.5 L467.875,151.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="38" x="489.75" y="162.1543">Visitor</text>
@@ -23,8 +23,8 @@
       <ellipse cx="379" cy="218.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="223" x="388" y="221.8198">visit_B(const B &amp; item) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm3isnjpd0jd6)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L16" target="_top" title="Visitor1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L16" xlink:show="new" xlink:title="Visitor1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gu6y3kzoagab)" height="73.6094" id="C_0001028369219400401946" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="117" y="288"/>
       <ellipse cx="202.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M205.7188,309.6406 Q205.1406,309.9375 204.5,310.0781 Q203.8594,310.2344 203.1563,310.2344 Q200.6563,310.2344 199.3281,308.5938 Q198.0156,306.9375 198.0156,303.8125 Q198.0156,300.6875 199.3281,299.0313 Q200.6563,297.375 203.1563,297.375 Q203.8594,297.375 204.5,297.5313 Q205.1563,297.6875 205.7188,297.9844 L205.7188,300.7031 Q205.0938,300.125 204.5,299.8594 Q203.9063,299.5781 203.2813,299.5781 Q201.9375,299.5781 201.25,300.6563 Q200.5625,301.7188 200.5625,303.8125 Q200.5625,305.9063 201.25,306.9844 Q201.9375,308.0469 203.2813,308.0469 Q203.9063,308.0469 204.5,307.7813 Q205.0938,307.5 205.7188,306.9219 L205.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="223.25" y="308.1543">Visitor1</text>
@@ -35,8 +35,8 @@
       <ellipse cx="128" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="137" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm3isnjpd0jd6)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L22" target="_top" title="Visitor2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L22" xlink:show="new" xlink:title="Visitor2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gu6y3kzoagab)" height="73.6094" id="C_0001710373315476287130" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="379" y="288"/>
       <ellipse cx="464.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M467.7188,309.6406 Q467.1406,309.9375 466.5,310.0781 Q465.8594,310.2344 465.1563,310.2344 Q462.6563,310.2344 461.3281,308.5938 Q460.0156,306.9375 460.0156,303.8125 Q460.0156,300.6875 461.3281,299.0313 Q462.6563,297.375 465.1563,297.375 Q465.8594,297.375 466.5,297.5313 Q467.1563,297.6875 467.7188,297.9844 L467.7188,300.7031 Q467.0938,300.125 466.5,299.8594 Q465.9063,299.5781 465.2813,299.5781 Q463.9375,299.5781 463.25,300.6563 Q462.5625,301.7188 462.5625,303.8125 Q462.5625,305.9063 463.25,306.9844 Q463.9375,308.0469 465.2813,308.0469 Q465.9063,308.0469 466.5,307.7813 Q467.0938,307.5 467.7188,306.9219 L467.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="485.25" y="308.1543">Visitor2</text>
@@ -47,8 +47,8 @@
       <ellipse cx="390" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="399" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm3isnjpd0jd6)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L28" target="_top" title="Visitor3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L28" xlink:show="new" xlink:title="Visitor3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gu6y3kzoagab)" height="73.6094" id="C_0001399026228179178025" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="641" y="288"/>
       <ellipse cx="726.75" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M729.7188,309.6406 Q729.1406,309.9375 728.5,310.0781 Q727.8594,310.2344 727.1563,310.2344 Q724.6563,310.2344 723.3281,308.5938 Q722.0156,306.9375 722.0156,303.8125 Q722.0156,300.6875 723.3281,299.0313 Q724.6563,297.375 727.1563,297.375 Q727.8594,297.375 728.5,297.5313 Q729.1563,297.6875 729.7188,297.9844 L729.7188,300.7031 Q729.0938,300.125 728.5,299.8594 Q727.9063,299.5781 727.2813,299.5781 Q725.9375,299.5781 725.25,300.6563 Q724.5625,301.7188 724.5625,303.8125 Q724.5625,305.9063 725.25,306.9844 Q725.9375,308.0469 727.2813,308.0469 Q727.9063,308.0469 728.5,307.7813 Q729.0938,307.5 729.7188,306.9219 L729.7188,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="747.25" y="308.1543">Visitor3</text>
@@ -59,8 +59,8 @@
       <ellipse cx="652" cy="351.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="661" y="355.0151">visit_B(const B &amp; item) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm3isnjpd0jd6)" height="73.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L34" target="_top" title="Item" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L34" xlink:show="new" xlink:title="Item" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gu6y3kzoagab)" height="73.6094" id="C_0001491568826758947722" style="stroke: #A80036; stroke-width: 1.5;" width="287" x="349" y="8"/>
       <ellipse cx="474.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M474.3594,19.3438 L473.2031,24.4219 L475.5313,24.4219 L474.3594,19.3438 Z M472.875,17.1094 L475.8594,17.1094 L479.2188,29.5 L476.7656,29.5 L476,26.4375 L472.7188,26.4375 L471.9688,29.5 L469.5313,29.5 L472.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="28" x="494.75" y="28.1543">Item</text>
@@ -71,8 +71,8 @@
       <ellipse cx="360" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="261" x="369" y="75.0151">accept(const Visitor &amp; visitor) const = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm3isnjpd0jd6)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L40" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L40" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gu6y3kzoagab)" height="60.8047" id="C_0001494142745564026823" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="6" y="422"/>
       <ellipse cx="130.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M133.2188,443.6406 Q132.6406,443.9375 132,444.0781 Q131.3594,444.2344 130.6563,444.2344 Q128.1563,444.2344 126.8281,442.5938 Q125.5156,440.9375 125.5156,437.8125 Q125.5156,434.6875 126.8281,433.0313 Q128.1563,431.375 130.6563,431.375 Q131.3594,431.375 132,431.5313 Q132.6563,431.6875 133.2188,431.9844 L133.2188,434.7031 Q132.5938,434.125 132,433.8594 Q131.4063,433.5781 130.7813,433.5781 Q129.4375,433.5781 128.75,434.6563 Q128.0625,435.7188 128.0625,437.8125 Q128.0625,439.9063 128.75,440.9844 Q129.4375,442.0469 130.7813,442.0469 Q131.4063,442.0469 132,441.7813 Q132.5938,441.5 133.2188,440.9219 L133.2188,443.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="150.75" y="442.1543">A</text>
@@ -81,8 +81,8 @@
       <ellipse cx="17" cy="473" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="239" x="26" y="476.2104">accept(const Visitor &amp; visitor) const : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm3isnjpd0jd6)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="422"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L45" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00021/t00021.cc#L45" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gu6y3kzoagab)" height="60.8047" id="C_0001452948650450999568" style="stroke: #A80036; stroke-width: 1.5;" width="265" x="714" y="422"/>
       <ellipse cx="838.25" cy="438" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M841.2188,443.6406 Q840.6406,443.9375 840,444.0781 Q839.3594,444.2344 838.6563,444.2344 Q836.1563,444.2344 834.8281,442.5938 Q833.5156,440.9375 833.5156,437.8125 Q833.5156,434.6875 834.8281,433.0313 Q836.1563,431.375 838.6563,431.375 Q839.3594,431.375 840,431.5313 Q840.6563,431.6875 841.2188,431.9844 L841.2188,434.7031 Q840.5938,434.125 840,433.8594 Q839.4063,433.5781 838.7813,433.5781 Q837.4375,433.5781 836.75,434.6563 Q836.0625,435.7188 836.0625,437.8125 Q836.0625,439.9063 836.75,440.9844 Q837.4375,442.0469 838.7813,442.0469 Q839.4063,442.0469 840,441.7813 Q840.5938,441.5 841.2188,440.9219 L841.2188,443.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="858.75" y="442.1543">B</text>
diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md
index 17101292..4aec1a19 100644
--- a/docs/test_cases/t00022.md
+++ b/docs/test_cases/t00022.md
@@ -53,3 +53,188 @@ protected:
 ```
 ## Generated UML diagrams
 ![t00022_class](./t00022_class.svg "Template method pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00022::A",
+      "id": "2012435893382068755",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "template_method",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "protected",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "method1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "protected",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "method2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00022",
+      "source_location": {
+        "file": "../../tests/t00022/t00022.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2012435893382068755",
+          "is_virtual": false,
+          "name": "clanguml::t00022::A"
+        }
+      ],
+      "display_name": "clanguml::t00022::A1",
+      "id": "2282061426381077447",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "protected",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "method1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "protected",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "method2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A1",
+      "namespace": "clanguml::t00022",
+      "source_location": {
+        "file": "../../tests/t00022/t00022.cc",
+        "line": 19
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2012435893382068755",
+          "is_virtual": false,
+          "name": "clanguml::t00022::A"
+        }
+      ],
+      "display_name": "clanguml::t00022::A2",
+      "id": "158819862916671538",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "protected",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "method1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "protected",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "method2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A2",
+      "namespace": "clanguml::t00022",
+      "source_location": {
+        "file": "../../tests/t00022/t00022.cc",
+        "line": 25
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00022_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2012435893382068755",
+      "source": "2282061426381077447",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2012435893382068755",
+      "source": "158819862916671538",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00022"
+}
+```
diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg
index 77149e2a..d3fd3698 100644
--- a/docs/test_cases/t00022_class.svg
+++ b/docs/test_cases/t00022_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="238px" preserveAspectRatio="none" style="width:290px;height:238px;" version="1.1" viewBox="0 0 290 238" width="290px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lo15p4cq7hcf" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1s1nx92qxt2uc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lo15p4cq7hcf)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00022/t00022.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00022/t00022.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s1nx92qxt2uc)" height="86.4141" id="C_0002012435893382068755" style="stroke: #A80036; stroke-width: 1.5;" width="168" x="58.5" y="8"/>
       <ellipse cx="134.25" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M134.3594,19.3438 L133.2031,24.4219 L135.5313,24.4219 L134.3594,19.3438 Z M132.875,17.1094 L135.8594,17.1094 L139.2188,29.5 L136.7656,29.5 L136,26.4375 L132.7188,26.4375 L131.9688,29.5 L129.5313,29.5 L132.875,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="8" x="154.75" y="28.1543">A</text>
@@ -23,8 +23,8 @@
       <polygon fill="#FFFF44" points="69.5,79.6094,73.5,83.6094,69.5,87.6094,65.5,83.6094" style="stroke: #B38D22; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="118" x="78.5" y="87.8198">method2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lo15p4cq7hcf)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00022/t00022.cc#L19" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00022/t00022.cc#L19" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s1nx92qxt2uc)" height="73.6094" id="C_0002282061426381077447" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="6" y="154"/>
       <ellipse cx="53.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M56.2188,175.6406 Q55.6406,175.9375 55,176.0781 Q54.3594,176.2344 53.6563,176.2344 Q51.1563,176.2344 49.8281,174.5938 Q48.5156,172.9375 48.5156,169.8125 Q48.5156,166.6875 49.8281,165.0313 Q51.1563,163.375 53.6563,163.375 Q54.3594,163.375 55,163.5313 Q55.6563,163.6875 56.2188,163.9844 L56.2188,166.7031 Q55.5938,166.125 55,165.8594 Q54.4063,165.5781 53.7813,165.5781 Q52.4375,165.5781 51.75,166.6563 Q51.0625,167.7188 51.0625,169.8125 Q51.0625,171.9063 51.75,172.9844 Q52.4375,174.0469 53.7813,174.0469 Q54.4063,174.0469 55,173.7813 Q55.5938,173.5 56.2188,172.9219 L56.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="73.75" y="174.1543">A1</text>
@@ -35,8 +35,8 @@
       <polygon fill="#FFFF44" points="17,212.8047,21,216.8047,17,220.8047,13,216.8047" style="stroke: #B38D22; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="93" x="26" y="221.0151">method2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lo15p4cq7hcf)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00022/t00022.cc#L25" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00022/t00022.cc#L25" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1s1nx92qxt2uc)" height="73.6094" id="C_0000158819862916671538" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="160" y="154"/>
       <ellipse cx="207.25" cy="170" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M210.2188,175.6406 Q209.6406,175.9375 209,176.0781 Q208.3594,176.2344 207.6563,176.2344 Q205.1563,176.2344 203.8281,174.5938 Q202.5156,172.9375 202.5156,169.8125 Q202.5156,166.6875 203.8281,165.0313 Q205.1563,163.375 207.6563,163.375 Q208.3594,163.375 209,163.5313 Q209.6563,163.6875 210.2188,163.9844 L210.2188,166.7031 Q209.5938,166.125 209,165.8594 Q208.4063,165.5781 207.7813,165.5781 Q206.4375,165.5781 205.75,166.6563 Q205.0625,167.7188 205.0625,169.8125 Q205.0625,171.9063 205.75,172.9844 Q206.4375,174.0469 207.7813,174.0469 Q208.4063,174.0469 209,173.7813 Q209.5938,173.5 210.2188,172.9219 L210.2188,175.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="227.75" y="174.1543">A2</text>
diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md
index b7a5dadf..ea52e1d9 100644
--- a/docs/test_cases/t00023.md
+++ b/docs/test_cases/t00023.md
@@ -62,3 +62,272 @@ private:
 ```
 ## Generated UML diagrams
 ![t00023_class](./t00023_class.svg "Strategy pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00023::Strategy",
+      "id": "1469857696438841976",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~Strategy",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "algorithm",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Strategy",
+      "namespace": "clanguml::t00023",
+      "source_location": {
+        "file": "../../tests/t00023/t00023.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1469857696438841976",
+          "is_virtual": false,
+          "name": "clanguml::t00023::Strategy"
+        }
+      ],
+      "display_name": "clanguml::t00023::StrategyA",
+      "id": "1245533075819635385",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "algorithm",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "StrategyA",
+      "namespace": "clanguml::t00023",
+      "source_location": {
+        "file": "../../tests/t00023/t00023.cc",
+        "line": 12
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1469857696438841976",
+          "is_virtual": false,
+          "name": "clanguml::t00023::Strategy"
+        }
+      ],
+      "display_name": "clanguml::t00023::StrategyB",
+      "id": "264986406899645",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "algorithm",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "StrategyB",
+      "namespace": "clanguml::t00023",
+      "source_location": {
+        "file": "../../tests/t00023/t00023.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1469857696438841976",
+          "is_virtual": false,
+          "name": "clanguml::t00023::Strategy"
+        }
+      ],
+      "display_name": "clanguml::t00023::StrategyC",
+      "id": "174795176193483089",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "algorithm",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "StrategyC",
+      "namespace": "clanguml::t00023",
+      "source_location": {
+        "file": "../../tests/t00023/t00023.cc",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00023::Context",
+      "id": "2038594012979479050",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "m_strategy",
+          "source_location": {
+            "file": "../../tests/t00023/t00023.cc",
+            "line": 37
+          },
+          "type": "std::unique_ptr<Strategy>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "Context",
+          "parameters": [
+            {
+              "name": "strategy",
+              "type": "std::unique_ptr<Strategy>"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "apply",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Context",
+      "namespace": "clanguml::t00023",
+      "source_location": {
+        "file": "../../tests/t00023/t00023.cc",
+        "line": 27
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00023_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1469857696438841976",
+      "source": "1245533075819635385",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1469857696438841976",
+      "source": "264986406899645",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1469857696438841976",
+      "source": "174795176193483089",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1469857696438841976",
+      "source": "2038594012979479050",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "1469857696438841976",
+      "label": "m_strategy",
+      "source": "2038594012979479050",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00023"
+}
+```
diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg
index 8bc7e504..292bed26 100644
--- a/docs/test_cases/t00023_class.svg
+++ b/docs/test_cases/t00023_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="377px" preserveAspectRatio="none" style="width:456px;height:377px;" version="1.1" viewBox="0 0 456 377" width="456px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fu3fgqkxh2q7q" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ic8w1lum57k" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu3fgqkxh2q7q)" height="73.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="134.5" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L6" target="_top" title="Strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L6" xlink:show="new" xlink:title="Strategy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ic8w1lum57k)" height="73.6094" id="C_0001469857696438841976" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="134.5" y="171"/>
       <ellipse cx="194.25" cy="187" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.3594,182.3438 L193.2031,187.4219 L195.5313,187.4219 L194.3594,182.3438 Z M192.875,180.1094 L195.8594,180.1094 L199.2188,192.5 L196.7656,192.5 L196,189.4375 L192.7188,189.4375 L191.9688,192.5 L189.5313,192.5 L192.875,180.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="54" x="214.75" y="191.1543">Strategy</text>
@@ -21,8 +21,8 @@
       <ellipse cx="145.5" cy="234.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="122" x="154.5" y="238.0151">algorithm() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu3fgqkxh2q7q)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L12" target="_top" title="StrategyA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L12" xlink:show="new" xlink:title="StrategyA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ic8w1lum57k)" height="60.8047" id="C_0001245533075819635385" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="6" y="306"/>
       <ellipse cx="34.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M37.4688,327.6406 Q36.8906,327.9375 36.25,328.0781 Q35.6094,328.2344 34.9063,328.2344 Q32.4063,328.2344 31.0781,326.5938 Q29.7656,324.9375 29.7656,321.8125 Q29.7656,318.6875 31.0781,317.0313 Q32.4063,315.375 34.9063,315.375 Q35.6094,315.375 36.25,315.5313 Q36.9063,315.6875 37.4688,315.9844 L37.4688,318.7031 Q36.8438,318.125 36.25,317.8594 Q35.6563,317.5781 35.0313,317.5781 Q33.6875,317.5781 33,318.6563 Q32.3125,319.7188 32.3125,321.8125 Q32.3125,323.9063 33,324.9844 Q33.6875,326.0469 35.0313,326.0469 Q35.6563,326.0469 36.25,325.7813 Q36.8438,325.5 37.4688,324.9219 L37.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="51.5" y="326.1543">StrategyA</text>
@@ -31,8 +31,8 @@
       <ellipse cx="17" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="26" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu3fgqkxh2q7q)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L17" target="_top" title="StrategyB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L17" xlink:show="new" xlink:title="StrategyB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ic8w1lum57k)" height="60.8047" id="C_0000000264986406899645" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="164" y="306"/>
       <ellipse cx="192.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M195.4688,327.6406 Q194.8906,327.9375 194.25,328.0781 Q193.6094,328.2344 192.9063,328.2344 Q190.4063,328.2344 189.0781,326.5938 Q187.7656,324.9375 187.7656,321.8125 Q187.7656,318.6875 189.0781,317.0313 Q190.4063,315.375 192.9063,315.375 Q193.6094,315.375 194.25,315.5313 Q194.9063,315.6875 195.4688,315.9844 L195.4688,318.7031 Q194.8438,318.125 194.25,317.8594 Q193.6563,317.5781 193.0313,317.5781 Q191.6875,317.5781 191,318.6563 Q190.3125,319.7188 190.3125,321.8125 Q190.3125,323.9063 191,324.9844 Q191.6875,326.0469 193.0313,326.0469 Q193.6563,326.0469 194.25,325.7813 Q194.8438,325.5 195.4688,324.9219 L195.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="209.5" y="326.1543">StrategyB</text>
@@ -41,8 +41,8 @@
       <ellipse cx="175" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="184" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu3fgqkxh2q7q)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L22" target="_top" title="StrategyC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L22" xlink:show="new" xlink:title="StrategyC" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ic8w1lum57k)" height="60.8047" id="C_0000174795176193483089" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="322" y="306"/>
       <ellipse cx="350.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M353.4688,327.6406 Q352.8906,327.9375 352.25,328.0781 Q351.6094,328.2344 350.9063,328.2344 Q348.4063,328.2344 347.0781,326.5938 Q345.7656,324.9375 345.7656,321.8125 Q345.7656,318.6875 347.0781,317.0313 Q348.4063,315.375 350.9063,315.375 Q351.6094,315.375 352.25,315.5313 Q352.9063,315.6875 353.4688,315.9844 L353.4688,318.7031 Q352.8438,318.125 352.25,317.8594 Q351.6563,317.5781 351.0313,317.5781 Q349.6875,317.5781 349,318.6563 Q348.3125,319.7188 348.3125,321.8125 Q348.3125,323.9063 349,324.9844 Q349.6875,326.0469 351.0313,326.0469 Q351.6563,326.0469 352.25,325.7813 Q352.8438,325.5 353.4688,324.9219 L353.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="61" x="367.5" y="326.1543">StrategyC</text>
@@ -51,18 +51,18 @@
       <ellipse cx="333" cy="357" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="97" x="342" y="360.2104">algorithm() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fu3fgqkxh2q7q)" height="86.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L27" target="_top" title="Context" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L27" xlink:show="new" xlink:title="Context" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ic8w1lum57k)" height="86.4141" id="C_0002038594012979479050" style="stroke: #A80036; stroke-width: 1.5;" width="315" x="68" y="8"/>
       <ellipse cx="197.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.2188,29.6406 Q199.6406,29.9375 199,30.0781 Q198.3594,30.2344 197.6563,30.2344 Q195.1563,30.2344 193.8281,28.5938 Q192.5156,26.9375 192.5156,23.8125 Q192.5156,20.6875 193.8281,19.0313 Q195.1563,17.375 197.6563,17.375 Q198.3594,17.375 199,17.5313 Q199.6563,17.6875 200.2188,17.9844 L200.2188,20.7031 Q199.5938,20.125 199,19.8594 Q198.4063,19.5781 197.7813,19.5781 Q196.4375,19.5781 195.75,20.6563 Q195.0625,21.7188 195.0625,23.8125 Q195.0625,25.9063 195.75,26.9844 Q196.4375,28.0469 197.7813,28.0469 Q198.4063,28.0469 199,27.7813 Q199.5938,27.5 200.2188,26.9219 L200.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="48" x="217.75" y="28.1543">Context</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="74" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="76" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L37" target="_top" title="m_strategy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00023/t00023.cc#L37" xlink:show="new" xlink:title="m_strategy" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="228" x="88" y="54.2104">m_strategy : std::unique_ptr&lt;Strategy&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="69" x2="382" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md
index 18210cfa..dafe2158 100644
--- a/docs/test_cases/t00024.md
+++ b/docs/test_cases/t00024.md
@@ -61,3 +61,287 @@ private:
 ```
 ## Generated UML diagrams
 ![t00024_class](./t00024_class.svg "Proxy pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00024::Target",
+      "id": "1116408959993110019",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~Target",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Target",
+      "namespace": "clanguml::t00024",
+      "source_location": {
+        "file": "../../tests/t00024/t00024.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1116408959993110019",
+          "is_virtual": false,
+          "name": "clanguml::t00024::Target"
+        }
+      ],
+      "display_name": "clanguml::t00024::Target1",
+      "id": "669517069151826610",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Target1",
+      "namespace": "clanguml::t00024",
+      "source_location": {
+        "file": "../../tests/t00024/t00024.cc",
+        "line": 14
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1116408959993110019",
+          "is_virtual": false,
+          "name": "clanguml::t00024::Target"
+        }
+      ],
+      "display_name": "clanguml::t00024::Target2",
+      "id": "1210513233906695933",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Target2",
+      "namespace": "clanguml::t00024",
+      "source_location": {
+        "file": "../../tests/t00024/t00024.cc",
+        "line": 20
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1116408959993110019",
+          "is_virtual": false,
+          "name": "clanguml::t00024::Target"
+        }
+      ],
+      "display_name": "clanguml::t00024::Proxy",
+      "id": "594707401639991215",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "m_target",
+          "source_location": {
+            "file": "../../tests/t00024/t00024.cc",
+            "line": 36
+          },
+          "type": "std::shared_ptr<Target>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "Proxy",
+          "parameters": [
+            {
+              "name": "target",
+              "type": "std::shared_ptr<Target>"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "m2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Proxy",
+      "namespace": "clanguml::t00024",
+      "source_location": {
+        "file": "../../tests/t00024/t00024.cc",
+        "line": 26
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00024_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1116408959993110019",
+      "source": "669517069151826610",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1116408959993110019",
+      "source": "1210513233906695933",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1116408959993110019",
+      "source": "594707401639991215",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "1116408959993110019",
+      "label": "m_target",
+      "source": "594707401639991215",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1116408959993110019",
+      "source": "594707401639991215",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00024"
+}
+```
diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg
index 3d5979e3..147ee095 100644
--- a/docs/test_cases/t00024_class.svg
+++ b/docs/test_cases/t00024_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="281px" preserveAspectRatio="none" style="width:542px;height:281px;" version="1.1" viewBox="0 0 542 281" width="542px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hitk6pb59uza" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1kvez6eeeipez" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hitk6pb59uza)" height="86.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="245.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L6" target="_top" title="Target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L6" xlink:show="new" xlink:title="Target" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kvez6eeeipez)" height="86.4141" id="C_0001116408959993110019" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="245.5" y="8"/>
       <ellipse cx="290.75" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M290.8594,19.3438 L289.7031,24.4219 L292.0313,24.4219 L290.8594,19.3438 Z M289.375,17.1094 L292.3594,17.1094 L295.7188,29.5 L293.2656,29.5 L292.5,26.4375 L289.2188,26.4375 L288.4688,29.5 L286.0313,29.5 L289.375,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="41" x="311.25" y="28.1543">Target</text>
@@ -23,8 +23,8 @@
       <ellipse cx="256.5" cy="84.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="265.5" y="87.8198">m2() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hitk6pb59uza)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="183.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L14" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L14" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kvez6eeeipez)" height="73.6094" id="C_0000669517069151826610" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="183.5"/>
       <ellipse cx="23.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,205.1406 Q26.0906,205.4375 25.45,205.5781 Q24.8094,205.7344 24.1063,205.7344 Q21.6063,205.7344 20.2781,204.0938 Q18.9656,202.4375 18.9656,199.3125 Q18.9656,196.1875 20.2781,194.5313 Q21.6063,192.875 24.1063,192.875 Q24.8094,192.875 25.45,193.0313 Q26.1063,193.1875 26.6688,193.4844 L26.6688,196.2031 Q26.0438,195.625 25.45,195.3594 Q24.8563,195.0781 24.2313,195.0781 Q22.8875,195.0781 22.2,196.1563 Q21.5125,197.2188 21.5125,199.3125 Q21.5125,201.4063 22.2,202.4844 Q22.8875,203.5469 24.2313,203.5469 Q24.8563,203.5469 25.45,203.2813 Q26.0438,203 26.6688,202.4219 L26.6688,205.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="203.6543">Target1</text>
@@ -35,8 +35,8 @@
       <ellipse cx="17" cy="247.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="250.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hitk6pb59uza)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="183.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L20" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L20" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kvez6eeeipez)" height="73.6094" id="C_0001210513233906695933" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="183.5"/>
       <ellipse cx="145.7" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M148.6688,205.1406 Q148.0906,205.4375 147.45,205.5781 Q146.8094,205.7344 146.1063,205.7344 Q143.6063,205.7344 142.2781,204.0938 Q140.9656,202.4375 140.9656,199.3125 Q140.9656,196.1875 142.2781,194.5313 Q143.6063,192.875 146.1063,192.875 Q146.8094,192.875 147.45,193.0313 Q148.1063,193.1875 148.6688,193.4844 L148.6688,196.2031 Q148.0438,195.625 147.45,195.3594 Q146.8563,195.0781 146.2313,195.0781 Q144.8875,195.0781 144.2,196.1563 Q143.5125,197.2188 143.5125,199.3125 Q143.5125,201.4063 144.2,202.4844 Q144.8875,203.5469 146.2313,203.5469 Q146.8563,203.5469 147.45,203.2813 Q148.0438,203 148.6688,202.4219 L148.6688,205.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="160.3" y="203.6543">Target2</text>
@@ -47,18 +47,18 @@
       <ellipse cx="139" cy="247.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="250.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hitk6pb59uza)" height="99.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L26" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L26" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1kvez6eeeipez)" height="99.2188" id="C_0000594707401639991215" style="stroke: #A80036; stroke-width: 1.5;" width="281" x="250" y="171"/>
       <ellipse cx="369.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M372.7188,192.6406 Q372.1406,192.9375 371.5,193.0781 Q370.8594,193.2344 370.1563,193.2344 Q367.6563,193.2344 366.3281,191.5938 Q365.0156,189.9375 365.0156,186.8125 Q365.0156,183.6875 366.3281,182.0313 Q367.6563,180.375 370.1563,180.375 Q370.8594,180.375 371.5,180.5313 Q372.1563,180.6875 372.7188,180.9844 L372.7188,183.7031 Q372.0938,183.125 371.5,182.8594 Q370.9063,182.5781 370.2813,182.5781 Q368.9375,182.5781 368.25,183.6563 Q367.5625,184.7188 367.5625,186.8125 Q367.5625,188.9063 368.25,189.9844 Q368.9375,191.0469 370.2813,191.0469 Q370.9063,191.0469 371.5,190.7813 Q372.0938,190.5 372.7188,189.9219 L372.7188,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="390.25" y="191.1543">Proxy</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="203" y2="203"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="256" y="209"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="258" y="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L36" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00024/t00024.cc#L36" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="206" x="270" y="217.2104">m_target : std::shared_ptr&lt;Target&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="251" x2="530" y1="223.8047" y2="223.8047"/>
diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md
index 25c1ebdd..9e8ad51a 100644
--- a/docs/test_cases/t00025.md
+++ b/docs/test_cases/t00025.md
@@ -59,3 +59,310 @@ public:
 ```
 ## Generated UML diagrams
 ![t00025_class](./t00025_class.svg "Template proxy pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00025::Target1",
+      "id": "1573849034571194138",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Target1",
+      "namespace": "clanguml::t00025",
+      "source_location": {
+        "file": "../../tests/t00025/t00025.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00025::Target2",
+      "id": "751896409461834669",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Target2",
+      "namespace": "clanguml::t00025",
+      "source_location": {
+        "file": "../../tests/t00025/t00025.cc",
+        "line": 12
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00025::Proxy<T>",
+      "id": "1483353300536405088",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "m_target",
+          "source_location": {
+            "file": "../../tests/t00025/t00025.cc",
+            "line": 28
+          },
+          "type": "std::shared_ptr<T>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "Proxy<T>",
+          "parameters": [
+            {
+              "name": "target",
+              "type": "std::shared_ptr<T>"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m1",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "m2",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Proxy",
+      "namespace": "clanguml::t00025",
+      "source_location": {
+        "file": "../../tests/t00025/t00025.cc",
+        "line": 18
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00025::Proxy<clanguml::t00025::Target1>",
+      "id": "1644966842838139424",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Proxy",
+      "namespace": "clanguml::t00025",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00025::Target1"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00025::Proxy<clanguml::t00025::Target2>",
+      "id": "1190103100236298763",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Proxy",
+      "namespace": "clanguml::t00025",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00025::Target2"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00025::ProxyHolder",
+      "id": "1906317303950647748",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "proxy1",
+          "source_location": {
+            "file": "../../tests/t00025/t00025.cc",
+            "line": 33
+          },
+          "type": "Proxy<clanguml::t00025::Target1>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "proxy2",
+          "source_location": {
+            "file": "../../tests/t00025/t00025.cc",
+            "line": 34
+          },
+          "type": "Proxy<clanguml::t00025::Target2>"
+        }
+      ],
+      "methods": [],
+      "name": "ProxyHolder",
+      "namespace": "clanguml::t00025",
+      "source_location": {
+        "file": "../../tests/t00025/t00025.cc",
+        "line": 31
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00025_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1573849034571194138",
+      "source": "1644966842838139424",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1483353300536405088",
+      "source": "1644966842838139424",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "751896409461834669",
+      "source": "1190103100236298763",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1483353300536405088",
+      "source": "1190103100236298763",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1644966842838139424",
+      "label": "proxy1",
+      "source": "1906317303950647748",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1190103100236298763",
+      "label": "proxy2",
+      "source": "1906317303950647748",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00025"
+}
+```
diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg
index 6e2cff91..e06c209d 100644
--- a/docs/test_cases/t00025_class.svg
+++ b/docs/test_cases/t00025_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="378px" preserveAspectRatio="none" style="width:538px;height:378px;" version="1.1" viewBox="0 0 538 378" width="538px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jq7ape2hlmgn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fmah3zoq0u9vu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jq7ape2hlmgn)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="280.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L6" target="_top" title="Target1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L6" xlink:show="new" xlink:title="Target1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmah3zoq0u9vu)" height="73.6094" id="C_0001573849034571194138" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="280.5"/>
       <ellipse cx="23.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M26.6688,302.1406 Q26.0906,302.4375 25.45,302.5781 Q24.8094,302.7344 24.1063,302.7344 Q21.6063,302.7344 20.2781,301.0938 Q18.9656,299.4375 18.9656,296.3125 Q18.9656,293.1875 20.2781,291.5313 Q21.6063,289.875 24.1063,289.875 Q24.8094,289.875 25.45,290.0313 Q26.1063,290.1875 26.6688,290.4844 L26.6688,293.2031 Q26.0438,292.625 25.45,292.3594 Q24.8563,292.0781 24.2313,292.0781 Q22.8875,292.0781 22.2,293.1563 Q21.5125,294.2188 21.5125,296.3125 Q21.5125,298.4063 22.2,299.4844 Q22.8875,300.5469 24.2313,300.5469 Q24.8563,300.5469 25.45,300.2813 Q26.0438,300 26.6688,299.4219 L26.6688,302.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="38.3" y="300.6543">Target1</text>
@@ -21,8 +21,8 @@
       <ellipse cx="17" cy="344.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="347.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jq7ape2hlmgn)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="440" y="280.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L12" target="_top" title="Target2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L12" xlink:show="new" xlink:title="Target2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmah3zoq0u9vu)" height="73.6094" id="C_0000751896409461834669" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="440" y="280.5"/>
       <ellipse cx="457.7" cy="296.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M460.6688,302.1406 Q460.0906,302.4375 459.45,302.5781 Q458.8094,302.7344 458.1063,302.7344 Q455.6063,302.7344 454.2781,301.0938 Q452.9656,299.4375 452.9656,296.3125 Q452.9656,293.1875 454.2781,291.5313 Q455.6063,289.875 458.1063,289.875 Q458.8094,289.875 459.45,290.0313 Q460.1063,290.1875 460.6688,290.4844 L460.6688,293.2031 Q460.0438,292.625 459.45,292.3594 Q458.8563,292.0781 458.2313,292.0781 Q456.8875,292.0781 456.2,293.1563 Q455.5125,294.2188 455.5125,296.3125 Q455.5125,298.4063 456.2,299.4844 Q456.8875,300.5469 458.2313,300.5469 Q458.8563,300.5469 459.45,300.2813 Q460.0438,300 460.6688,299.4219 L460.6688,302.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="472.3" y="300.6543">Target2</text>
@@ -33,8 +33,8 @@
       <ellipse cx="451" cy="344.3047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="460" y="347.5151">m2() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jq7ape2hlmgn)" height="99.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="128.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L18" target="_top" title="Proxy" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L18" xlink:show="new" xlink:title="Proxy" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmah3zoq0u9vu)" height="99.2188" id="C_0001483353300536405088" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="128.5" y="268"/>
       <ellipse cx="240.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M243.2188,289.6406 Q242.6406,289.9375 242,290.0781 Q241.3594,290.2344 240.6563,290.2344 Q238.1563,290.2344 236.8281,288.5938 Q235.5156,286.9375 235.5156,283.8125 Q235.5156,280.6875 236.8281,279.0313 Q238.1563,277.375 240.6563,277.375 Q241.3594,277.375 242,277.5313 Q242.6563,277.6875 243.2188,277.9844 L243.2188,280.7031 Q242.5938,280.125 242,279.8594 Q241.4063,279.5781 240.7813,279.5781 Q239.4375,279.5781 238.75,280.6563 Q238.0625,281.7188 238.0625,283.8125 Q238.0625,285.9063 238.75,286.9844 Q239.4375,288.0469 240.7813,288.0469 Q241.4063,288.0469 242,287.7813 Q242.5938,287.5 243.2188,286.9219 L243.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="260.75" y="288.1543">Proxy</text>
@@ -42,11 +42,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="399.5" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="403.5" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134.5" y="306"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="136.5" y="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L28" target="_top" title="m_target" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L28" xlink:show="new" xlink:title="m_target" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="148.5" y="314.2104">m_target : std::shared_ptr&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129.5" x2="403.5" y1="320.8047" y2="320.8047"/>
@@ -56,7 +56,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148.5" y="347.8198">m1() : void</text>
     <ellipse cx="139.5" cy="357.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148.5" y="360.6245">m2() : void</text>
-    <rect fill="#FEFECE" filter="url(#f1jq7ape2hlmgn)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="131.5" y="159"/>
+    <rect fill="#FEFECE" filter="url(#fmah3zoq0u9vu)" height="48" id="C_0001644966842838139424" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="131.5" y="159"/>
     <ellipse cx="146.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M149.4688,180.6406 Q148.8906,180.9375 148.25,181.0781 Q147.6094,181.2344 146.9063,181.2344 Q144.4063,181.2344 143.0781,179.5938 Q141.7656,177.9375 141.7656,174.8125 Q141.7656,171.6875 143.0781,170.0313 Q144.4063,168.375 146.9063,168.375 Q147.6094,168.375 148.25,168.5313 Q148.9063,168.6875 149.4688,168.9844 L149.4688,171.7031 Q148.8438,171.125 148.25,170.8594 Q147.6563,170.5781 147.0313,170.5781 Q145.6875,170.5781 145,171.6563 Q144.3125,172.7188 144.3125,174.8125 Q144.3125,176.9063 145,177.9844 Q145.6875,179.0469 147.0313,179.0469 Q147.6563,179.0469 148.25,178.7813 Q148.8438,178.5 149.4688,177.9219 L149.4688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="160.5" y="179.1543">Proxy</text>
@@ -64,7 +64,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="202.5" y="168.1387">Target1</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="248.5" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="132.5" x2="248.5" y1="199" y2="199"/>
-    <rect fill="#FEFECE" filter="url(#f1jq7ape2hlmgn)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="284.5" y="159"/>
+    <rect fill="#FEFECE" filter="url(#fmah3zoq0u9vu)" height="48" id="C_0001190103100236298763" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="284.5" y="159"/>
     <ellipse cx="299.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M302.4688,180.6406 Q301.8906,180.9375 301.25,181.0781 Q300.6094,181.2344 299.9063,181.2344 Q297.4063,181.2344 296.0781,179.5938 Q294.7656,177.9375 294.7656,174.8125 Q294.7656,171.6875 296.0781,170.0313 Q297.4063,168.375 299.9063,168.375 Q300.6094,168.375 301.25,168.5313 Q301.9063,168.6875 302.4688,168.9844 L302.4688,171.7031 Q301.8438,171.125 301.25,170.8594 Q300.6563,170.5781 300.0313,170.5781 Q298.6875,170.5781 298,171.6563 Q297.3125,172.7188 297.3125,174.8125 Q297.3125,176.9063 298,177.9844 Q298.6875,179.0469 300.0313,179.0469 Q300.6563,179.0469 301.25,178.7813 Q301.8438,178.5 302.4688,177.9219 L302.4688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="33" x="313.5" y="179.1543">Proxy</text>
@@ -72,25 +72,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="355.5" y="168.1387">Target2</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="401.5" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285.5" x2="401.5" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1jq7ape2hlmgn)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="182" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L31" target="_top" title="ProxyHolder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L31" xlink:show="new" xlink:title="ProxyHolder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fmah3zoq0u9vu)" height="73.6094" id="C_0001906317303950647748" style="stroke: #A80036; stroke-width: 1.5;" width="169" x="182" y="8"/>
       <ellipse cx="225.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M228.3188,29.6406 Q227.7406,29.9375 227.1,30.0781 Q226.4594,30.2344 225.7563,30.2344 Q223.2563,30.2344 221.9281,28.5938 Q220.6156,26.9375 220.6156,23.8125 Q220.6156,20.6875 221.9281,19.0313 Q223.2563,17.375 225.7563,17.375 Q226.4594,17.375 227.1,17.5313 Q227.7563,17.6875 228.3188,17.9844 L228.3188,20.7031 Q227.6938,20.125 227.1,19.8594 Q226.5063,19.5781 225.8813,19.5781 Q224.5375,19.5781 223.85,20.6563 Q223.1625,21.7188 223.1625,23.8125 Q223.1625,25.9063 223.85,26.9844 Q224.5375,28.0469 225.8813,28.0469 Q226.5063,28.0469 227.1,27.7813 Q227.6938,27.5 228.3188,26.9219 L228.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="245.65" y="28.1543">ProxyHolder</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="350" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="188" y="46"/>
       <ellipse cx="193" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L33" target="_top" title="proxy1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L33" xlink:show="new" xlink:title="proxy1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="202" y="54.2104">proxy1 : Proxy&lt;Target1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="188" y="58.8047"/>
       <ellipse cx="193" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L34" target="_top" title="proxy2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00025/t00025.cc#L34" xlink:show="new" xlink:title="proxy2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="143" x="202" y="67.0151">proxy2 : Proxy&lt;Target2&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="350" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md
index 3e5b3729..6ca8c99f 100644
--- a/docs/test_cases/t00026.md
+++ b/docs/test_cases/t00026.md
@@ -80,3 +80,406 @@ struct StringMemento {
 ```
 ## Generated UML diagrams
 ![t00026_class](./t00026_class.svg "Template memento pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00026::Memento<T>",
+      "id": "1241204213727905390",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "m_value",
+          "source_location": {
+            "file": "../../tests/t00026/t00026.cc",
+            "line": 18
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "Memento<T>",
+          "parameters": [
+            {
+              "name": "v",
+              "type": "T &&"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "value",
+          "parameters": [],
+          "type": "T"
+        }
+      ],
+      "name": "Memento",
+      "namespace": "clanguml::t00026",
+      "source_location": {
+        "file": "../../tests/t00026/t00026.cc",
+        "line": 8
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00026::Originator<T>",
+      "id": "1324770803720816727",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "m_value",
+          "source_location": {
+            "file": "../../tests/t00026/t00026.cc",
+            "line": 37
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "Originator<T>",
+          "parameters": [
+            {
+              "name": "v",
+              "type": "T &&"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "memoize_value",
+          "parameters": [],
+          "type": "Memento<T>"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "load",
+          "parameters": [
+            {
+              "name": "m",
+              "type": "const Memento<T> &"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "print",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "set",
+          "parameters": [
+            {
+              "name": "v",
+              "type": "T &&"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "Originator",
+      "namespace": "clanguml::t00026",
+      "source_location": {
+        "file": "../../tests/t00026/t00026.cc",
+        "line": 21
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00026::Caretaker<T>",
+      "id": "2032715387182792204",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "m_mementos",
+          "source_location": {
+            "file": "../../tests/t00026/t00026.cc",
+            "line": 50
+          },
+          "type": "std::unordered_map<std::string,Memento<T>>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "state",
+          "parameters": [
+            {
+              "name": "n",
+              "type": "const std::string &"
+            }
+          ],
+          "type": "Memento<T> &"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "set_state",
+          "parameters": [
+            {
+              "name": "s",
+              "type": "const std::string &"
+            },
+            {
+              "name": "m",
+              "type": "Memento<T> &&"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "Caretaker",
+      "namespace": "clanguml::t00026",
+      "source_location": {
+        "file": "../../tests/t00026/t00026.cc",
+        "line": 40
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00026::Caretaker<std::string>",
+      "id": "1708482137721157489",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Caretaker",
+      "namespace": "clanguml::t00026",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00026::Originator<std::string>",
+      "id": "1014247960805363560",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Originator",
+      "namespace": "clanguml::t00026",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00026::StringMemento",
+      "id": "851750942915129289",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "caretaker",
+          "source_location": {
+            "file": "../../tests/t00026/t00026.cc",
+            "line": 54
+          },
+          "type": "Caretaker<std::string>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "originator",
+          "source_location": {
+            "file": "../../tests/t00026/t00026.cc",
+            "line": 55
+          },
+          "type": "Originator<std::string>"
+        }
+      ],
+      "methods": [],
+      "name": "StringMemento",
+      "namespace": "clanguml::t00026",
+      "source_location": {
+        "file": "../../tests/t00026/t00026.cc",
+        "line": 53
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00026_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1241204213727905390",
+      "source": "1324770803720816727",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1241204213727905390",
+      "source": "2032715387182792204",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "1241204213727905390",
+      "label": "m_mementos",
+      "source": "2032715387182792204",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "2032715387182792204",
+      "source": "1708482137721157489",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1324770803720816727",
+      "source": "1014247960805363560",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1708482137721157489",
+      "label": "caretaker",
+      "source": "851750942915129289",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1014247960805363560",
+      "label": "originator",
+      "source": "851750942915129289",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00026"
+}
+```
diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg
index 82641929..82741827 100644
--- a/docs/test_cases/t00026_class.svg
+++ b/docs/test_cases/t00026_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="567px" preserveAspectRatio="none" style="width:690px;height:567px;" version="1.1" viewBox="0 0 690 567" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ftdf5ewh4c0i0" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwnhe9drnhezn" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftdf5ewh4c0i0)" height="86.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="165.5" y="470"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L8" target="_top" title="Memento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L8" xlink:show="new" xlink:title="Memento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwnhe9drnhezn)" height="86.4141" id="C_0001241204213727905390" style="stroke: #A80036; stroke-width: 1.5;" width="187" x="165.5" y="470"/>
       <ellipse cx="220.25" cy="486" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.2188,491.6406 Q222.6406,491.9375 222,492.0781 Q221.3594,492.2344 220.6563,492.2344 Q218.1563,492.2344 216.8281,490.5938 Q215.5156,488.9375 215.5156,485.8125 Q215.5156,482.6875 216.8281,481.0313 Q218.1563,479.375 220.6563,479.375 Q221.3594,479.375 222,479.5313 Q222.6563,479.6875 223.2188,479.9844 L223.2188,482.7031 Q222.5938,482.125 222,481.8594 Q221.4063,481.5781 220.7813,481.5781 Q219.4375,481.5781 218.75,482.6563 Q218.0625,483.7188 218.0625,485.8125 Q218.0625,487.9063 218.75,488.9844 Q219.4375,490.0469 220.7813,490.0469 Q221.4063,490.0469 222,489.7813 Q222.5938,489.5 223.2188,488.9219 L223.2188,491.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="240.75" y="490.1543">Memento</text>
@@ -18,11 +18,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="347.5" y="479.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="166.5" x2="351.5" y1="502" y2="502"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="171.5" y="508"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="173.5" y="510"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L18" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L18" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="185.5" y="516.2104">m_value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="166.5" x2="351.5" y1="522.8047" y2="522.8047"/>
@@ -30,8 +30,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="161" x="185.5" y="537.0151">Memento&lt;T&gt;(T &amp;&amp; v) : void</text>
     <ellipse cx="176.5" cy="546.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="185.5" y="549.8198">value() const : T</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftdf5ewh4c0i0)" height="124.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L21" target="_top" title="Originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L21" xlink:show="new" xlink:title="Originator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwnhe9drnhezn)" height="124.8281" id="C_0001324770803720816727" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="431.5" y="268"/>
       <ellipse cx="513.25" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M516.2188,289.6406 Q515.6406,289.9375 515,290.0781 Q514.3594,290.2344 513.6563,290.2344 Q511.1563,290.2344 509.8281,288.5938 Q508.5156,286.9375 508.5156,283.8125 Q508.5156,280.6875 509.8281,279.0313 Q511.1563,277.375 513.6563,277.375 Q514.3594,277.375 515,277.5313 Q515.6563,277.6875 516.2188,277.9844 L516.2188,280.7031 Q515.5938,280.125 515,279.8594 Q514.4063,279.5781 513.7813,279.5781 Q512.4375,279.5781 511.75,280.6563 Q511.0625,281.7188 511.0625,283.8125 Q511.0625,285.9063 511.75,286.9844 Q512.4375,288.0469 513.7813,288.0469 Q514.4063,288.0469 515,287.7813 Q515.5938,287.5 516.2188,286.9219 L516.2188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="533.75" y="288.1543">Originator</text>
@@ -39,11 +39,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="671.5" y="277.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="300" y2="300"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="437.5" y="306"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="439.5" y="308"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L37" target="_top" title="m_value" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L37" xlink:show="new" xlink:title="m_value" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="66" x="451.5" y="314.2104">m_value : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="432.5" x2="675.5" y1="320.8047" y2="320.8047"/>
@@ -57,8 +57,8 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="104" x="451.5" y="373.4292">print() const : void</text>
     <ellipse cx="442.5" cy="383.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="451.5" y="386.2339">set(T &amp;&amp; v) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftdf5ewh4c0i0)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="287.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L40" target="_top" title="Caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L40" xlink:show="new" xlink:title="Caretaker" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwnhe9drnhezn)" height="86.4141" id="C_0002032715387182792204" style="stroke: #A80036; stroke-width: 1.5;" width="390" x="6" y="287.5"/>
       <ellipse cx="160.25" cy="303.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.2188,309.1406 Q162.6406,309.4375 162,309.5781 Q161.3594,309.7344 160.6563,309.7344 Q158.1563,309.7344 156.8281,308.0938 Q155.5156,306.4375 155.5156,303.3125 Q155.5156,300.1875 156.8281,298.5313 Q158.1563,296.875 160.6563,296.875 Q161.3594,296.875 162,297.0313 Q162.6563,297.1875 163.2188,297.4844 L163.2188,300.2031 Q162.5938,299.625 162,299.3594 Q161.4063,299.0781 160.7813,299.0781 Q159.4375,299.0781 158.75,300.1563 Q158.0625,301.2188 158.0625,303.3125 Q158.0625,305.4063 158.75,306.4844 Q159.4375,307.5469 160.7813,307.5469 Q161.4063,307.5469 162,307.2813 Q162.5938,307 163.2188,306.4219 L163.2188,309.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="180.75" y="307.6543">Caretaker</text>
@@ -66,11 +66,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="391" y="296.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="319.5" y2="319.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="325.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="14" y="327.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L50" target="_top" title="m_mementos" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L50" xlink:show="new" xlink:title="m_mementos" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="364" x="26" y="333.7104">m_mementos : std::unordered_map&lt;std::string,Memento&lt;T&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="395" y1="340.3047" y2="340.3047"/>
@@ -78,7 +78,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="259" x="26" y="354.5151">state(const std::string &amp; n) : Memento&lt;T&gt; &amp;</text>
     <ellipse cx="17" cy="364.1094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="339" x="26" y="367.3198">set_state(const std::string &amp; s, Memento&lt;T&gt; &amp;&amp; m) : void</text>
-    <rect fill="#FEFECE" filter="url(#ftdf5ewh4c0i0)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
+    <rect fill="#FEFECE" filter="url(#fwnhe9drnhezn)" height="48" id="C_0001708482137721157489" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="239" y="159"/>
     <ellipse cx="254" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M256.9688,180.6406 Q256.3906,180.9375 255.75,181.0781 Q255.1094,181.2344 254.4063,181.2344 Q251.9063,181.2344 250.5781,179.5938 Q249.2656,177.9375 249.2656,174.8125 Q249.2656,171.6875 250.5781,170.0313 Q251.9063,168.375 254.4063,168.375 Q255.1094,168.375 255.75,168.5313 Q256.4063,168.6875 256.9688,168.9844 L256.9688,171.7031 Q256.3438,171.125 255.75,170.8594 Q255.1563,170.5781 254.5313,170.5781 Q253.1875,170.5781 252.5,171.6563 Q251.8125,172.7188 251.8125,174.8125 Q251.8125,176.9063 252.5,177.9844 Q253.1875,179.0469 254.5313,179.0469 Q255.1563,179.0469 255.75,178.7813 Q256.3438,178.5 256.9688,177.9219 L256.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="268" y="179.1543">Caretaker</text>
@@ -86,7 +86,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="339" y="168.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="240" x2="398" y1="199" y2="199"/>
-    <rect fill="#FEFECE" filter="url(#ftdf5ewh4c0i0)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
+    <rect fill="#FEFECE" filter="url(#fwnhe9drnhezn)" height="48" id="C_0001014247960805363560" style="stroke: #A80036; stroke-width: 1.5;" width="160" x="454" y="159"/>
     <ellipse cx="469" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M471.9688,180.6406 Q471.3906,180.9375 470.75,181.0781 Q470.1094,181.2344 469.4063,181.2344 Q466.9063,181.2344 465.5781,179.5938 Q464.2656,177.9375 464.2656,174.8125 Q464.2656,171.6875 465.5781,170.0313 Q466.9063,168.375 469.4063,168.375 Q470.1094,168.375 470.75,168.5313 Q471.4063,168.6875 471.9688,168.9844 L471.9688,171.7031 Q471.3438,171.125 470.75,170.8594 Q470.1563,170.5781 469.5313,170.5781 Q468.1875,170.5781 467.5,171.6563 Q466.8125,172.7188 466.8125,174.8125 Q466.8125,176.9063 467.5,177.9844 Q468.1875,179.0469 469.5313,179.0469 Q470.1563,179.0469 470.75,178.7813 Q471.3438,178.5 471.9688,177.9219 L471.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="62" x="483" y="179.1543">Originator</text>
@@ -94,25 +94,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="554" y="168.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="613" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#ftdf5ewh4c0i0)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L53" target="_top" title="StringMemento" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L53" xlink:show="new" xlink:title="StringMemento" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwnhe9drnhezn)" height="73.6094" id="C_0000851750942915129289" style="stroke: #A80036; stroke-width: 1.5;" width="227" x="302.5" y="8"/>
       <ellipse cx="364.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M367.2188,29.6406 Q366.6406,29.9375 366,30.0781 Q365.3594,30.2344 364.6563,30.2344 Q362.1563,30.2344 360.8281,28.5938 Q359.5156,26.9375 359.5156,23.8125 Q359.5156,20.6875 360.8281,19.0313 Q362.1563,17.375 364.6563,17.375 Q365.3594,17.375 366,17.5313 Q366.6563,17.6875 367.2188,17.9844 L367.2188,20.7031 Q366.5938,20.125 366,19.8594 Q365.4063,19.5781 364.7813,19.5781 Q363.4375,19.5781 362.75,20.6563 Q362.0625,21.7188 362.0625,23.8125 Q362.0625,25.9063 362.75,26.9844 Q363.4375,28.0469 364.7813,28.0469 Q365.4063,28.0469 366,27.7813 Q366.5938,27.5 367.2188,26.9219 L367.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="95" x="384.75" y="28.1543">StringMemento</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="46"/>
       <ellipse cx="313.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L54" target="_top" title="caretaker" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L54" xlink:show="new" xlink:title="caretaker" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="199" x="322.5" y="54.2104">caretaker : Caretaker&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="308.5" y="58.8047"/>
       <ellipse cx="313.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L55" target="_top" title="originator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00026/t00026.cc#L55" xlink:show="new" xlink:title="originator" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="201" x="322.5" y="67.0151">originator : Originator&lt;std::string&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="303.5" x2="528.5" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md
index e94a8eee..08a7deb1 100644
--- a/docs/test_cases/t00027.md
+++ b/docs/test_cases/t00027.md
@@ -77,3 +77,590 @@ struct Window {
 ```
 ## Generated UML diagrams
 ![t00027_class](./t00027_class.svg "Template decorator pattern")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::Shape",
+      "id": "1593092483959332221",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "display",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": true,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "~Shape",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Shape",
+      "namespace": "clanguml::t00027",
+      "source_location": {
+        "file": "../../tests/t00027/t00027.cc",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::Line",
+      "id": "1568932879061562228",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Line",
+      "namespace": "clanguml::t00027",
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1593092483959332221",
+          "is_virtual": false,
+          "name": "clanguml::t00027::Shape"
+        },
+        {
+          "access": "public",
+          "id": "2184609081997324211",
+          "is_virtual": false,
+          "name": "T<Line<>>"
+        }
+      ],
+      "display_name": "clanguml::t00027::Line<T<>...>",
+      "id": "142374082478337852",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "display",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Line",
+      "namespace": "clanguml::t00027",
+      "source_location": {
+        "file": "../../tests/t00027/t00027.cc",
+        "line": 15
+      },
+      "template_parameters": [
+        {
+          "is_variadic": true,
+          "kind": "template_template_type",
+          "name": "T<>...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::Text",
+      "id": "1833467466291294724",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Text",
+      "namespace": "clanguml::t00027",
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1593092483959332221",
+          "is_virtual": false,
+          "name": "clanguml::t00027::Shape"
+        },
+        {
+          "access": "public",
+          "id": "2247508827463056747",
+          "is_virtual": false,
+          "name": "T<Text<>>"
+        }
+      ],
+      "display_name": "clanguml::t00027::Text<T<>...>",
+      "id": "1114634647721878603",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "display",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Text",
+      "namespace": "clanguml::t00027",
+      "source_location": {
+        "file": "../../tests/t00027/t00027.cc",
+        "line": 25
+      },
+      "template_parameters": [
+        {
+          "is_variadic": true,
+          "kind": "template_template_type",
+          "name": "T<>...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::ShapeDecorator",
+      "id": "2049188825706164566",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "display",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "ShapeDecorator",
+      "namespace": "clanguml::t00027",
+      "source_location": {
+        "file": "../../tests/t00027/t00027.cc",
+        "line": 34
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2049188825706164566",
+          "is_virtual": false,
+          "name": "clanguml::t00027::ShapeDecorator"
+        }
+      ],
+      "display_name": "clanguml::t00027::Color<T>",
+      "id": "1473536569433029444",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "display",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Color",
+      "namespace": "clanguml::t00027",
+      "source_location": {
+        "file": "../../tests/t00027/t00027.cc",
+        "line": 38
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2049188825706164566",
+          "is_virtual": false,
+          "name": "clanguml::t00027::ShapeDecorator"
+        }
+      ],
+      "display_name": "clanguml::t00027::Weight<T>",
+      "id": "2049455532387561338",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "display",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Weight",
+      "namespace": "clanguml::t00027",
+      "source_location": {
+        "file": "../../tests/t00027/t00027.cc",
+        "line": 43
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::Line<clanguml::t00027::Color,clanguml::t00027::Weight>",
+      "id": "2082936326417164202",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Line",
+      "namespace": "clanguml::t00027",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "clanguml::t00027::Color",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "clanguml::t00027::Weight",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::Line<clanguml::t00027::Color>",
+      "id": "675132943535054947",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Line",
+      "namespace": "clanguml::t00027",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "clanguml::t00027::Color",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::Text<clanguml::t00027::Color,clanguml::t00027::Weight>",
+      "id": "1678874302644303776",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Text",
+      "namespace": "clanguml::t00027",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "clanguml::t00027::Color",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "clanguml::t00027::Weight",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::Text<clanguml::t00027::Color>",
+      "id": "1887786688778664182",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Text",
+      "namespace": "clanguml::t00027",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "clanguml::t00027::Color",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00027::Window",
+      "id": "1373544984027721472",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "border",
+          "source_location": {
+            "file": "../../tests/t00027/t00027.cc",
+            "line": 49
+          },
+          "type": "Line<clanguml::t00027::Color,clanguml::t00027::Weight>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "divider",
+          "source_location": {
+            "file": "../../tests/t00027/t00027.cc",
+            "line": 50
+          },
+          "type": "Line<clanguml::t00027::Color>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "title",
+          "source_location": {
+            "file": "../../tests/t00027/t00027.cc",
+            "line": 51
+          },
+          "type": "Text<clanguml::t00027::Color,clanguml::t00027::Weight>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "description",
+          "source_location": {
+            "file": "../../tests/t00027/t00027.cc",
+            "line": 52
+          },
+          "type": "Text<clanguml::t00027::Color>"
+        }
+      ],
+      "methods": [],
+      "name": "Window",
+      "namespace": "clanguml::t00027",
+      "source_location": {
+        "file": "../../tests/t00027/t00027.cc",
+        "line": 48
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00027_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "142374082478337852",
+      "source": "1568932879061562228",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1593092483959332221",
+      "source": "142374082478337852",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2184609081997324211",
+      "source": "142374082478337852",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1114634647721878603",
+      "source": "1833467466291294724",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1593092483959332221",
+      "source": "1114634647721878603",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2247508827463056747",
+      "source": "1114634647721878603",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2049188825706164566",
+      "source": "1473536569433029444",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2049188825706164566",
+      "source": "2049455532387561338",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "142374082478337852",
+      "source": "2082936326417164202",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "142374082478337852",
+      "source": "675132943535054947",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1114634647721878603",
+      "source": "1678874302644303776",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1114634647721878603",
+      "source": "1887786688778664182",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2082936326417164202",
+      "label": "border",
+      "source": "1373544984027721472",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "675132943535054947",
+      "label": "divider",
+      "source": "1373544984027721472",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1678874302644303776",
+      "label": "title",
+      "source": "1373544984027721472",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1887786688778664182",
+      "label": "description",
+      "source": "1373544984027721472",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00027"
+}
+```
diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg
index cadd73ad..4d963ed1 100644
--- a/docs/test_cases/t00027_class.svg
+++ b/docs/test_cases/t00027_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:1274px;height:390px;" version="1.1" viewBox="0 0 1274 390" width="1274px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hkq3ho350j1o" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fg8a34foffj6d" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="73.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="402.5" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L8" target="_top" title="Shape" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L8" xlink:show="new" xlink:title="Shape" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="73.6094" id="C_0001593092483959332221" style="stroke: #A80036; stroke-width: 1.5;" width="170" x="402.5" y="184"/>
       <ellipse cx="463.25" cy="200" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M463.3594,195.3438 L462.2031,200.4219 L464.5313,200.4219 L463.3594,195.3438 Z M461.875,193.1094 L464.8594,193.1094 L468.2188,205.5 L465.7656,205.5 L465,202.4375 L461.7188,202.4375 L460.9688,205.5 L458.5313,205.5 L461.875,193.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="40" x="483.75" y="204.1543">Shape</text>
@@ -21,14 +21,14 @@
       <ellipse cx="413.5" cy="247.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="144" x="422.5" y="251.0151">~Shape() = default : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="134" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="48" id="C_0001568932879061562228" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="134" y="197"/>
     <ellipse cx="149" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M151.9688,218.6406 Q151.3906,218.9375 150.75,219.0781 Q150.1094,219.2344 149.4063,219.2344 Q146.9063,219.2344 145.5781,217.5938 Q144.2656,215.9375 144.2656,212.8125 Q144.2656,209.6875 145.5781,208.0313 Q146.9063,206.375 149.4063,206.375 Q150.1094,206.375 150.75,206.5313 Q151.4063,206.6875 151.9688,206.9844 L151.9688,209.7031 Q151.3438,209.125 150.75,208.8594 Q150.1563,208.5781 149.5313,208.5781 Q148.1875,208.5781 147.5,209.6563 Q146.8125,210.7188 146.8125,212.8125 Q146.8125,214.9063 147.5,215.9844 Q148.1875,217.0469 149.5313,217.0469 Q150.1563,217.0469 150.75,216.7813 Q151.3438,216.5 151.9688,215.9219 L151.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="163" y="217.1543">Line</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="190" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="135" x2="190" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="142" y="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L15" target="_top" title="Line" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L15" xlink:show="new" xlink:title="Line" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="60.8047" id="C_0000142374082478337852" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="142" y="319"/>
       <ellipse cx="161.05" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M164.0188,340.6406 Q163.4406,340.9375 162.8,341.0781 Q162.1594,341.2344 161.4563,341.2344 Q158.9563,341.2344 157.6281,339.5938 Q156.3156,337.9375 156.3156,334.8125 Q156.3156,331.6875 157.6281,330.0313 Q158.9563,328.375 161.4563,328.375 Q162.1594,328.375 162.8,328.5313 Q163.4563,328.6875 164.0188,328.9844 L164.0188,331.7031 Q163.3938,331.125 162.8,330.8594 Q162.2063,330.5781 161.5813,330.5781 Q160.2375,330.5781 159.55,331.6563 Q158.8625,332.7188 158.8625,334.8125 Q158.8625,336.9063 159.55,337.9844 Q160.2375,339.0469 161.5813,339.0469 Q162.2063,339.0469 162.8,338.7813 Q163.3938,338.5 164.0188,337.9219 L164.0188,340.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="175.95" y="339.1543">Line</text>
@@ -39,14 +39,14 @@
       <ellipse cx="153" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="162" y="373.2104">display() : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="913.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="48" id="C_0001833467466291294724" style="stroke: #A80036; stroke-width: 1.5;" width="58" x="913.5" y="197"/>
     <ellipse cx="928.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M931.4688,218.6406 Q930.8906,218.9375 930.25,219.0781 Q929.6094,219.2344 928.9063,219.2344 Q926.4063,219.2344 925.0781,217.5938 Q923.7656,215.9375 923.7656,212.8125 Q923.7656,209.6875 925.0781,208.0313 Q926.4063,206.375 928.9063,206.375 Q929.6094,206.375 930.25,206.5313 Q930.9063,206.6875 931.4688,206.9844 L931.4688,209.7031 Q930.8438,209.125 930.25,208.8594 Q929.6563,208.5781 929.0313,208.5781 Q927.6875,208.5781 927,209.6563 Q926.3125,210.7188 926.3125,212.8125 Q926.3125,214.9063 927,215.9844 Q927.6875,217.0469 929.0313,217.0469 Q929.6563,217.0469 930.25,216.7813 Q930.8438,216.5 931.4688,215.9219 L931.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="942.5" y="217.1543">Text</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="914.5" x2="970.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="914.5" x2="970.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="696" y="319"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L25" target="_top" title="Text" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L25" xlink:show="new" xlink:title="Text" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="60.8047" id="C_0001114634647721878603" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="696" y="319"/>
       <ellipse cx="714.6" cy="335" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M717.5688,340.6406 Q716.9906,340.9375 716.35,341.0781 Q715.7094,341.2344 715.0063,341.2344 Q712.5063,341.2344 711.1781,339.5938 Q709.8656,337.9375 709.8656,334.8125 Q709.8656,331.6875 711.1781,330.0313 Q712.5063,328.375 715.0063,328.375 Q715.7094,328.375 716.35,328.5313 Q717.0063,328.6875 717.5688,328.9844 L717.5688,331.7031 Q716.9438,331.125 716.35,330.8594 Q715.7563,330.5781 715.1313,330.5781 Q713.7875,330.5781 713.1,331.6563 Q712.4125,332.7188 712.4125,334.8125 Q712.4125,336.9063 713.1,337.9844 Q713.7875,339.0469 715.1313,339.0469 Q715.7563,339.0469 716.35,338.7813 Q716.9438,338.5 717.5688,337.9219 L717.5688,340.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="729.4" y="339.1543">Text</text>
@@ -57,8 +57,8 @@
       <ellipse cx="707" cy="370" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="716" y="373.2104">display() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1066" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L34" target="_top" title="ShapeDecorator" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L34" xlink:show="new" xlink:title="ShapeDecorator" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="60.8047" id="C_0002049188825706164566" style="stroke: #A80036; stroke-width: 1.5;" width="135" x="1066" y="27"/>
       <ellipse cx="1081" cy="43" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1081.1094,38.3438 L1079.9531,43.4219 L1082.2813,43.4219 L1081.1094,38.3438 Z M1079.625,36.1094 L1082.6094,36.1094 L1085.9688,48.5 L1083.5156,48.5 L1082.75,45.4375 L1079.4688,45.4375 L1078.7188,48.5 L1076.2813,48.5 L1079.625,36.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="103" x="1095" y="47.1543">ShapeDecorator</text>
@@ -67,8 +67,8 @@
       <ellipse cx="1077" cy="78" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="1086" y="81.2104">display() = 0 : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1007" y="190.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L38" target="_top" title="Color" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L38" xlink:show="new" xlink:title="Color" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="60.8047" id="C_0001473536569433029444" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1007" y="190.5"/>
       <ellipse cx="1037.3" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1040.2688,212.1406 Q1039.6906,212.4375 1039.05,212.5781 Q1038.4094,212.7344 1037.7063,212.7344 Q1035.2063,212.7344 1033.8781,211.0938 Q1032.5656,209.4375 1032.5656,206.3125 Q1032.5656,203.1875 1033.8781,201.5313 Q1035.2063,199.875 1037.7063,199.875 Q1038.4094,199.875 1039.05,200.0313 Q1039.7063,200.1875 1040.2688,200.4844 L1040.2688,203.2031 Q1039.6438,202.625 1039.05,202.3594 Q1038.4563,202.0781 1037.8313,202.0781 Q1036.4875,202.0781 1035.8,203.1563 Q1035.1125,204.2188 1035.1125,206.3125 Q1035.1125,208.4063 1035.8,209.4844 Q1036.4875,210.5469 1037.8313,210.5469 Q1038.4563,210.5469 1039.05,210.2813 Q1039.6438,210 1040.2688,209.4219 L1040.2688,212.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1054.7" y="210.6543">Color</text>
@@ -79,8 +79,8 @@
       <ellipse cx="1018" cy="241.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1027" y="244.7104">display() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1151" y="190.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L43" target="_top" title="Weight" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L43" xlink:show="new" xlink:title="Weight" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="60.8047" id="C_0002049455532387561338" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="1151" y="190.5"/>
       <ellipse cx="1176.35" cy="206.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1179.3188,212.1406 Q1178.7406,212.4375 1178.1,212.5781 Q1177.4594,212.7344 1176.7563,212.7344 Q1174.2563,212.7344 1172.9281,211.0938 Q1171.6156,209.4375 1171.6156,206.3125 Q1171.6156,203.1875 1172.9281,201.5313 Q1174.2563,199.875 1176.7563,199.875 Q1177.4594,199.875 1178.1,200.0313 Q1178.7563,200.1875 1179.3188,200.4844 L1179.3188,203.2031 Q1178.6938,202.625 1178.1,202.3594 Q1177.5063,202.0781 1176.8813,202.0781 Q1175.5375,202.0781 1174.85,203.1563 Q1174.1625,204.2188 1174.1625,206.3125 Q1174.1625,208.4063 1174.85,209.4844 Q1175.5375,210.5469 1176.8813,210.5469 Q1177.5063,210.5469 1178.1,210.2813 Q1178.6938,210 1179.3188,209.4219 L1179.3188,212.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1192.65" y="210.6543">Weight</text>
@@ -91,7 +91,7 @@
       <ellipse cx="1162" cy="241.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="83" x="1171" y="244.7104">display() : void</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="226" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="48" id="C_0002082936326417164202" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="226" y="197"/>
     <ellipse cx="241" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M243.9688,218.6406 Q243.3906,218.9375 242.75,219.0781 Q242.1094,219.2344 241.4063,219.2344 Q238.9063,219.2344 237.5781,217.5938 Q236.2656,215.9375 236.2656,212.8125 Q236.2656,209.6875 237.5781,208.0313 Q238.9063,206.375 241.4063,206.375 Q242.1094,206.375 242.75,206.5313 Q243.4063,206.6875 243.9688,206.9844 L243.9688,209.7031 Q243.3438,209.125 242.75,208.8594 Q242.1563,208.5781 241.5313,208.5781 Q240.1875,208.5781 239.5,209.6563 Q238.8125,210.7188 238.8125,212.8125 Q238.8125,214.9063 239.5,215.9844 Q240.1875,217.0469 241.5313,217.0469 Q242.1563,217.0469 242.75,216.7813 Q243.3438,216.5 243.9688,215.9219 L243.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="255" y="217.1543">Line</text>
@@ -99,7 +99,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="289" y="206.1387">Color,Weight</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="227" x2="366" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="227" x2="366" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="48" id="C_0000675132943535054947" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="6" y="197"/>
     <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="217.1543">Line</text>
@@ -107,7 +107,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="69" y="206.1387">Color</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="98" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="607.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="48" id="C_0001678874302644303776" style="stroke: #A80036; stroke-width: 1.5;" width="142" x="607.5" y="197"/>
     <ellipse cx="622.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M625.4688,218.6406 Q624.8906,218.9375 624.25,219.0781 Q623.6094,219.2344 622.9063,219.2344 Q620.4063,219.2344 619.0781,217.5938 Q617.7656,215.9375 617.7656,212.8125 Q617.7656,209.6875 619.0781,208.0313 Q620.4063,206.375 622.9063,206.375 Q623.6094,206.375 624.25,206.5313 Q624.9063,206.6875 625.4688,206.9844 L625.4688,209.7031 Q624.8438,209.125 624.25,208.8594 Q623.6563,208.5781 623.0313,208.5781 Q621.6875,208.5781 621,209.6563 Q620.3125,210.7188 620.3125,212.8125 Q620.3125,214.9063 621,215.9844 Q621.6875,217.0469 623.0313,217.0469 Q623.6563,217.0469 624.25,216.7813 Q624.8438,216.5 625.4688,215.9219 L625.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="636.5" y="217.1543">Text</text>
@@ -115,7 +115,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="671.5" y="206.1387">Color,Weight</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="608.5" x2="748.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="608.5" x2="748.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="784.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="48" id="C_0001887786688778664182" style="stroke: #A80036; stroke-width: 1.5;" width="94" x="784.5" y="197"/>
     <ellipse cx="799.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M802.4688,218.6406 Q801.8906,218.9375 801.25,219.0781 Q800.6094,219.2344 799.9063,219.2344 Q797.4063,219.2344 796.0781,217.5938 Q794.7656,215.9375 794.7656,212.8125 Q794.7656,209.6875 796.0781,208.0313 Q797.4063,206.375 799.9063,206.375 Q800.6094,206.375 801.25,206.5313 Q801.9063,206.6875 802.4688,206.9844 L802.4688,209.7031 Q801.8438,209.125 801.25,208.8594 Q800.6563,208.5781 800.0313,208.5781 Q798.6875,208.5781 798,209.6563 Q797.3125,210.7188 797.3125,212.8125 Q797.3125,214.9063 798,215.9844 Q798.6875,217.0469 800.0313,217.0469 Q800.6563,217.0469 801.25,216.7813 Q801.8438,216.5 802.4688,215.9219 L802.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="26" x="813.5" y="217.1543">Text</text>
@@ -123,39 +123,39 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="32" x="848.5" y="206.1387">Color</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="785.5" x2="877.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="785.5" x2="877.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hkq3ho350j1o)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="428.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L48" target="_top" title="Window" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L48" xlink:show="new" xlink:title="Window" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg8a34foffj6d)" height="99.2188" id="C_0001373544984027721472" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="428.5" y="8"/>
       <ellipse cx="494.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M497.7188,29.6406 Q497.1406,29.9375 496.5,30.0781 Q495.8594,30.2344 495.1563,30.2344 Q492.6563,30.2344 491.3281,28.5938 Q490.0156,26.9375 490.0156,23.8125 Q490.0156,20.6875 491.3281,19.0313 Q492.6563,17.375 495.1563,17.375 Q495.8594,17.375 496.5,17.5313 Q497.1563,17.6875 497.7188,17.9844 L497.7188,20.7031 Q497.0938,20.125 496.5,19.8594 Q495.9063,19.5781 495.2813,19.5781 Q493.9375,19.5781 493.25,20.6563 Q492.5625,21.7188 492.5625,23.8125 Q492.5625,25.9063 493.25,26.9844 Q493.9375,28.0469 495.2813,28.0469 Q495.9063,28.0469 496.5,27.7813 Q497.0938,27.5 497.7188,26.9219 L497.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="47" x="515.25" y="28.1543">Window</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="429.5" x2="615.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="46"/>
       <ellipse cx="439.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L49" target="_top" title="border" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L49" xlink:show="new" xlink:title="border" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="448.5" y="54.2104">border : Line&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="58.8047"/>
       <ellipse cx="439.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L50" target="_top" title="divider" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L50" xlink:show="new" xlink:title="divider" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="121" x="448.5" y="67.0151">divider : Line&lt;Color&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="71.6094"/>
       <ellipse cx="439.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L51" target="_top" title="title" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L51" xlink:show="new" xlink:title="title" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="146" x="448.5" y="79.8198">title : Text&lt;Color,Weight&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="434.5" y="84.4141"/>
       <ellipse cx="439.5" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L52" target="_top" title="description" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00027/t00027.cc#L52" xlink:show="new" xlink:title="description" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="147" x="448.5" y="92.6245">description : Text&lt;Color&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="429.5" x2="615.5" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md
index 35ad898c..652039eb 100644
--- a/docs/test_cases/t00028.md
+++ b/docs/test_cases/t00028.md
@@ -86,3 +86,386 @@ class R {
 ```
 ## Generated UML diagrams
 ![t00028_class](./t00028_class.svg "PlantUML note decorator test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "\\uml{note[top] A class note.}",
+        "raw": "/// \\uml{note[top] A class note.}"
+      },
+      "display_name": "clanguml::t00028::A",
+      "id": "1519850480962783588",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00028",
+      "source_location": {
+        "file": "../../tests/t00028/t00028.cc",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "\\uml{note[] B class note.}",
+        "raw": "/// \\uml{note[] B class note.}"
+      },
+      "display_name": "clanguml::t00028::B",
+      "id": "1980597091567213070",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00028",
+      "source_location": {
+        "file": "../../tests/t00028/t00028.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "\n @uml{note:t00028_class[bottom] C class note.}\n This is class C.",
+        "raw": "///\n/// @uml{note:t00028_class[bottom] C class note.}\n/// This is class C."
+      },
+      "display_name": "clanguml::t00028::C",
+      "id": "984577258575112753",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00028",
+      "source_location": {
+        "file": "../../tests/t00028/t00028.cc",
+        "line": 16
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "\\uml{note\nD\nclass\nnote.}",
+        "raw": "/// \\uml{note\n/// D\n/// class\n/// note.}"
+      },
+      "display_name": "clanguml::t00028::D",
+      "id": "1263778658518784070",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00028",
+      "source_location": {
+        "file": "../../tests/t00028/t00028.cc",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "\\uml{note E template class note.}",
+        "raw": "/// \\uml{note E template class note.}"
+      },
+      "display_name": "clanguml::t00028::E<T>",
+      "id": "1014136565447389473",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "param",
+          "source_location": {
+            "file": "../../tests/t00028/t00028.cc",
+            "line": 26
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00028",
+      "source_location": {
+        "file": "../../tests/t00028/t00028.cc",
+        "line": 25
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "\\uml{note:other_diagram[left] G class note.}",
+        "raw": "/// \\uml{note:other_diagram[left] G class note.}"
+      },
+      "display_name": "clanguml::t00028::G",
+      "id": "764713728396057122",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00028",
+      "source_location": {
+        "file": "../../tests/t00028/t00028.cc",
+        "line": 30
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "comment": {
+        "formatted": "@uml{note[ bottom ] F enum note.}",
+        "raw": "/// @uml{note[ bottom ] F enum note.}"
+      },
+      "constants": [
+        "one",
+        "two",
+        "three"
+      ],
+      "display_name": "clanguml::t00028::F",
+      "id": "589227897266388677",
+      "is_nested": false,
+      "name": "F",
+      "namespace": "clanguml::t00028",
+      "source_location": {
+        "file": "../../tests/t00028/t00028.cc",
+        "line": 33
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00028::E<int>",
+      "id": "1949673179441298667",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00028",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "\\uml{note[right] R class note.}",
+        "raw": "/// \\uml{note[right] R class note.}"
+      },
+      "display_name": "clanguml::t00028::R",
+      "id": "1189142882239313116",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "comment": {
+            "formatted": "\\uml{note[left] R contains an instance of A.}",
+            "raw": "/// \\uml{note[left] R contains an instance of A.}"
+          },
+          "is_static": false,
+          "name": "aaa",
+          "source_location": {
+            "file": "../../tests/t00028/t00028.cc",
+            "line": 43
+          },
+          "type": "clanguml::t00028::A"
+        },
+        {
+          "access": "private",
+          "comment": {
+            "formatted": "\\uml{note:other_diagram[right] R contains an pointer to B.}",
+            "raw": "/// \\uml{note:other_diagram[right] R contains an pointer to B.}"
+          },
+          "is_static": false,
+          "name": "bbb",
+          "source_location": {
+            "file": "../../tests/t00028/t00028.cc",
+            "line": 46
+          },
+          "type": "clanguml::t00028::B *"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "ccc",
+          "source_location": {
+            "file": "../../tests/t00028/t00028.cc",
+            "line": 48
+          },
+          "type": "clanguml::t00028::C &"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "ddd",
+          "source_location": {
+            "file": "../../tests/t00028/t00028.cc",
+            "line": 50
+          },
+          "type": "std::vector<std::shared_ptr<D>>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "eee",
+          "source_location": {
+            "file": "../../tests/t00028/t00028.cc",
+            "line": 52
+          },
+          "type": "E<int>"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "ggg",
+          "source_location": {
+            "file": "../../tests/t00028/t00028.cc",
+            "line": 54
+          },
+          "type": "clanguml::t00028::G **"
+        }
+      ],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "R",
+          "parameters": [
+            {
+              "name": "c",
+              "type": "clanguml::t00028::C &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "R",
+      "namespace": "clanguml::t00028",
+      "source_location": {
+        "file": "../../tests/t00028/t00028.cc",
+        "line": 36
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00028_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1014136565447389473",
+      "source": "1949673179441298667",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "984577258575112753",
+      "source": "1189142882239313116",
+      "type": "dependency"
+    },
+    {
+      "access": "private",
+      "destination": "1519850480962783588",
+      "label": "aaa",
+      "source": "1189142882239313116",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1980597091567213070",
+      "label": "bbb",
+      "source": "1189142882239313116",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "984577258575112753",
+      "label": "ccc",
+      "source": "1189142882239313116",
+      "type": "association"
+    },
+    {
+      "access": "private",
+      "destination": "1263778658518784070",
+      "label": "ddd",
+      "source": "1189142882239313116",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1949673179441298667",
+      "label": "eee",
+      "source": "1189142882239313116",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "764713728396057122",
+      "label": "ggg",
+      "source": "1189142882239313116",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00028"
+}
+```
diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg
index a0fc906d..b2a939e7 100644
--- a/docs/test_cases/t00028_class.svg
+++ b/docs/test_cases/t00028_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="410px" preserveAspectRatio="none" style="width:1109px;height:410px;" version="1.1" viewBox="0 0 1109 410" width="1109px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fpk991h2x65i8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1npcdx76y94ar" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,54 +9,54 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="48" id="C_0001519850480962783588" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156.5" y="226.5"/>
       <ellipse cx="171.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M174.4688,248.1406 Q173.8906,248.4375 173.25,248.5781 Q172.6094,248.7344 171.9063,248.7344 Q169.4063,248.7344 168.0781,247.0938 Q166.7656,245.4375 166.7656,242.3125 Q166.7656,239.1875 168.0781,237.5313 Q169.4063,235.875 171.9063,235.875 Q172.6094,235.875 173.25,236.0313 Q173.9063,236.1875 174.4688,236.4844 L174.4688,239.2031 Q173.8438,238.625 173.25,238.3594 Q172.6563,238.0781 172.0313,238.0781 Q170.6875,238.0781 170,239.1563 Q169.3125,240.2188 169.3125,242.3125 Q169.3125,244.4063 170,245.4844 Q170.6875,246.5469 172.0313,246.5469 Q172.6563,246.5469 173.25,246.2813 Q173.8438,246 174.4688,245.4219 L174.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185.5" y="246.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157.5" x2="195.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157.5" x2="195.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L61.49,89.6328 L160.49,226.42 L69.49,89.6328 L109,89.6328 A0,0 0 0 0 109,89.6328 L109,74.5 L99,64.5 L6,64.5 A0,0 0 0 0 6,64.5 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,64.5 L6,89.6328 A0,0 0 0 0 6,89.6328 L61.49,89.6328 L160.49,226.42 L69.49,89.6328 L109,89.6328 A0,0 0 0 0 109,89.6328 L109,74.5 L99,64.5 L6,64.5 A0,0 0 0 0 6,64.5 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M99,64.5 L99,74.5 L109,74.5 L99,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="12" y="81.5669">A class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="750.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="48" id="C_0001980597091567213070" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="750.5" y="226.5"/>
       <ellipse cx="765.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M768.4688,248.1406 Q767.8906,248.4375 767.25,248.5781 Q766.6094,248.7344 765.9063,248.7344 Q763.4063,248.7344 762.0781,247.0938 Q760.7656,245.4375 760.7656,242.3125 Q760.7656,239.1875 762.0781,237.5313 Q763.4063,235.875 765.9063,235.875 Q766.6094,235.875 767.25,236.0313 Q767.9063,236.1875 768.4688,236.4844 L768.4688,239.2031 Q767.8438,238.625 767.25,238.3594 Q766.6563,238.0781 766.0313,238.0781 Q764.6875,238.0781 764,239.1563 Q763.3125,240.2188 763.3125,242.3125 Q763.3125,244.4063 764,245.4844 Q764.6875,246.5469 766.0313,246.5469 Q766.6563,246.5469 767.25,246.2813 Q767.8438,246 768.4688,245.4219 L768.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="779.5" y="246.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="751.5" x2="789.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="751.5" x2="789.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M612,238 L612,263.1328 A0,0 0 0 0 612,263.1328 L715,263.1328 A0,0 0 0 0 715,263.1328 L715,256 L750.24,250.5 L715,248 L715,248 L705,238 L612,238 A0,0 0 0 0 612,238 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M612,238 L612,263.1328 A0,0 0 0 0 612,263.1328 L715,263.1328 A0,0 0 0 0 715,263.1328 L715,256 L750.24,250.5 L715,248 L715,248 L705,238 L612,238 A0,0 0 0 0 612,238 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M705,238 L705,248 L715,248 L705,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="618" y="255.0669">B class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309.5" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="48" id="C_0000984577258575112753" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309.5" y="226.5"/>
       <ellipse cx="324.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M327.4688,248.1406 Q326.8906,248.4375 326.25,248.5781 Q325.6094,248.7344 324.9063,248.7344 Q322.4063,248.7344 321.0781,247.0938 Q319.7656,245.4375 319.7656,242.3125 Q319.7656,239.1875 321.0781,237.5313 Q322.4063,235.875 324.9063,235.875 Q325.6094,235.875 326.25,236.0313 Q326.9063,236.1875 327.4688,236.4844 L327.4688,239.2031 Q326.8438,238.625 326.25,238.3594 Q325.6563,238.0781 325.0313,238.0781 Q323.6875,238.0781 323,239.1563 Q322.3125,240.2188 322.3125,242.3125 Q322.3125,244.4063 323,245.4844 Q323.6875,246.5469 325.0313,246.5469 Q325.6563,246.5469 326.25,246.2813 Q326.8438,246 327.4688,245.4219 L327.4688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338.5" y="246.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="348.5" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="348.5" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M222,357 L222,382.1328 A0,0 0 0 0 222,382.1328 L325,382.1328 A0,0 0 0 0 325,382.1328 L325,367 L315,357 L283.08,357 L318.44,274.62 L275.08,357 L222,357 A0,0 0 0 0 222,357 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M222,357 L222,382.1328 A0,0 0 0 0 222,382.1328 L325,382.1328 A0,0 0 0 0 325,382.1328 L325,367 L315,357 L283.08,357 L318.44,274.62 L275.08,357 L222,357 A0,0 0 0 0 222,357 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M315,357 L315,367 L325,367 L315,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="228" y="374.0669">C class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="915" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L22" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L22" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="48" id="C_0001263778658518784070" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="915" y="226.5"/>
       <ellipse cx="930" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M932.9688,248.1406 Q932.3906,248.4375 931.75,248.5781 Q931.1094,248.7344 930.4063,248.7344 Q927.9063,248.7344 926.5781,247.0938 Q925.2656,245.4375 925.2656,242.3125 Q925.2656,239.1875 926.5781,237.5313 Q927.9063,235.875 930.4063,235.875 Q931.1094,235.875 931.75,236.0313 Q932.4063,236.1875 932.9688,236.4844 L932.9688,239.2031 Q932.3438,238.625 931.75,238.3594 Q931.1563,238.0781 930.5313,238.0781 Q929.1875,238.0781 928.5,239.1563 Q927.8125,240.2188 927.8125,242.3125 Q927.8125,244.4063 928.5,245.4844 Q929.1875,246.5469 930.5313,246.5469 Q931.1563,246.5469 931.75,246.2813 Q932.3438,246 932.9688,245.4219 L932.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="944" y="246.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="916" x2="955" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="916" x2="955" y1="266.5" y2="266.5"/>
     </a>
-    <path d="M825.5,223 L825.5,278.3984 A0,0 0 0 0 825.5,278.3984 L879.5,278.3984 A0,0 0 0 0 879.5,278.3984 L879.5,254.5 L914.59,250.5 L879.5,246.5 L879.5,233 L869.5,223 L825.5,223 A0,0 0 0 0 825.5,223 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M825.5,223 L825.5,278.3984 A0,0 0 0 0 825.5,278.3984 L879.5,278.3984 A0,0 0 0 0 879.5,278.3984 L879.5,254.5 L914.59,250.5 L879.5,246.5 L879.5,233 L869.5,223 L825.5,223 A0,0 0 0 0 825.5,223 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M869.5,223 L869.5,233 L879.5,233 L869.5,223 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="10" x="831.5" y="240.0669">D</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="32" x="831.5" y="255.1997">class</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="831.5" y="270.3325">note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="559.5" y="339"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="60.8047" id="C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="559.5" y="339"/>
       <ellipse cx="588.45" cy="355" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M591.4188,360.6406 Q590.8406,360.9375 590.2,361.0781 Q589.5594,361.2344 588.8563,361.2344 Q586.3563,361.2344 585.0281,359.5938 Q583.7156,357.9375 583.7156,354.8125 Q583.7156,351.6875 585.0281,350.0313 Q586.3563,348.375 588.8563,348.375 Q589.5594,348.375 590.2,348.5313 Q590.8563,348.6875 591.4188,348.9844 L591.4188,351.7031 Q590.7938,351.125 590.2,350.8594 Q589.6063,350.5781 588.9813,350.5781 Q587.6375,350.5781 586.95,351.6563 Q586.2625,352.7188 586.2625,354.8125 Q586.2625,356.9063 586.95,357.9844 Q587.6375,359.0469 588.9813,359.0469 Q589.6063,359.0469 590.2,358.7813 Q590.7938,358.5 591.4188,357.9219 L591.4188,360.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="605.55" y="359.1543">E</text>
@@ -64,27 +64,27 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="636.5" y="348.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="560.5" x2="640.5" y1="371" y2="371"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="565.5" y="377"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="567.5" y="379"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L26" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L26" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="579.5" y="385.2104">param : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="560.5" x2="640.5" y1="391.8047" y2="391.8047"/>
-    <path d="M360.5,357 L360.5,382.1328 A0,0 0 0 0 360.5,382.1328 L524.5,382.1328 A0,0 0 0 0 524.5,382.1328 L524.5,375 L559.28,369.5 L524.5,367 L524.5,367 L514.5,357 L360.5,357 A0,0 0 0 0 360.5,357 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M360.5,357 L360.5,382.1328 A0,0 0 0 0 360.5,382.1328 L524.5,382.1328 A0,0 0 0 0 524.5,382.1328 L524.5,375 L559.28,369.5 L524.5,367 L524.5,367 L514.5,357 L360.5,357 A0,0 0 0 0 360.5,357 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M514.5,357 L514.5,367 L524.5,367 L514.5,357 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="143" x="366.5" y="374.0669">E template class note.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="440" y="226.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L30" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L30" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="48" id="C_0000764713728396057122" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="440" y="226.5"/>
       <ellipse cx="455" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M457.9688,248.1406 Q457.3906,248.4375 456.75,248.5781 Q456.1094,248.7344 455.4063,248.7344 Q452.9063,248.7344 451.5781,247.0938 Q450.2656,245.4375 450.2656,242.3125 Q450.2656,239.1875 451.5781,237.5313 Q452.9063,235.875 455.4063,235.875 Q456.1094,235.875 456.75,236.0313 Q457.4063,236.1875 457.9688,236.4844 L457.9688,239.2031 Q457.3438,238.625 456.75,238.3594 Q456.1563,238.0781 455.5313,238.0781 Q454.1875,238.0781 453.5,239.1563 Q452.8125,240.2188 452.8125,242.3125 Q452.8125,244.4063 453.5,245.4844 Q454.1875,246.5469 455.5313,246.5469 Q456.1563,246.5469 456.75,246.2813 Q457.3438,246 457.9688,245.4219 L457.9688,248.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="469" y="246.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="441" x2="480" y1="258.5" y2="258.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="441" x2="480" y1="266.5" y2="266.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="1023.5" y="34"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L33" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L33" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="86.4141" id="C_0000589227897266388677" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="1023.5" y="34"/>
       <ellipse cx="1039.85" cy="50" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1043.9594,56 L1036.2406,56 L1036.2406,43.6094 L1043.9594,43.6094 L1043.9594,45.7656 L1038.6938,45.7656 L1038.6938,48.4375 L1043.4594,48.4375 L1043.4594,50.5938 L1038.6938,50.5938 L1038.6938,53.8438 L1043.9594,53.8438 L1043.9594,56 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1054.15" y="54.1543">F</text>
@@ -94,10 +94,10 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="1029.5" y="105.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1024.5" x2="1064.5" y1="112.4141" y2="112.4141"/>
     </a>
-    <path d="M991.5,238 L991.5,263.1328 A0,0 0 0 0 991.5,263.1328 L1097.5,263.1328 A0,0 0 0 0 1097.5,263.1328 L1097.5,248 L1087.5,238 L1048.5,238 L1044.5,120.39 L1040.5,238 L991.5,238 A0,0 0 0 0 991.5,238 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M991.5,238 L991.5,263.1328 A0,0 0 0 0 991.5,263.1328 L1097.5,263.1328 A0,0 0 0 0 1097.5,263.1328 L1097.5,248 L1087.5,238 L1048.5,238 L1044.5,120.39 L1040.5,238 L991.5,238 A0,0 0 0 0 991.5,238 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1087.5,238 L1087.5,248 L1097.5,248 L1087.5,238 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="997.5" y="255.0669">F enum note.</text>
-    <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="516.5" y="226.5"/>
+    <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="48" id="C_0001949673179441298667" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="516.5" y="226.5"/>
     <ellipse cx="531.5" cy="242.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M534.4688,248.1406 Q533.8906,248.4375 533.25,248.5781 Q532.6094,248.7344 531.9063,248.7344 Q529.4063,248.7344 528.0781,247.0938 Q526.7656,245.4375 526.7656,242.3125 Q526.7656,239.1875 528.0781,237.5313 Q529.4063,235.875 531.9063,235.875 Q532.6094,235.875 533.25,236.0313 Q533.9063,236.1875 534.4688,236.4844 L534.4688,239.2031 Q533.8438,238.625 533.25,238.3594 Q532.6563,238.0781 532.0313,238.0781 Q530.6875,238.0781 530,239.1563 Q529.3125,240.2188 529.3125,242.3125 Q529.3125,244.4063 530,245.4844 Q530.6875,246.5469 532.0313,246.5469 Q532.6563,246.5469 533.25,246.2813 Q533.8438,246 534.4688,245.4219 L534.4688,248.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="545.5" y="246.6543">E</text>
@@ -105,65 +105,65 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="562.5" y="235.6387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="517.5" x2="575.5" y1="258.5" y2="258.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="517.5" x2="575.5" y1="266.5" y2="266.5"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpk991h2x65i8)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="377.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L36" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L36" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1npcdx76y94ar)" height="137.6328" id="C_0001189142882239313116" style="stroke: #A80036; stroke-width: 1.5;" width="252" x="377.5" y="8"/>
       <ellipse cx="495.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M498.2188,29.6406 Q497.6406,29.9375 497,30.0781 Q496.3594,30.2344 495.6563,30.2344 Q493.1563,30.2344 491.8281,28.5938 Q490.5156,26.9375 490.5156,23.8125 Q490.5156,20.6875 491.8281,19.0313 Q493.1563,17.375 495.6563,17.375 Q496.3594,17.375 497,17.5313 Q497.6563,17.6875 498.2188,17.9844 L498.2188,20.7031 Q497.5938,20.125 497,19.8594 Q496.4063,19.5781 495.7813,19.5781 Q494.4375,19.5781 493.75,20.6563 Q493.0625,21.7188 493.0625,23.8125 Q493.0625,25.9063 493.75,26.9844 Q494.4375,28.0469 495.7813,28.0469 Q496.4063,28.0469 497,27.7813 Q497.5938,27.5 498.2188,26.9219 L498.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="515.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="46"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L43" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L43" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="397.5" y="54.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="58.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="60.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L46" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L46" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="397.5" y="67.0151">bbb : B *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="71.6094"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="73.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L48" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L48" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="52" x="397.5" y="79.8198">ccc : C &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="84.4141"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L50" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L50" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="226" x="397.5" y="92.6245">ddd : std::vector&lt;std::shared_ptr&lt;D&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="97.2188"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="99.2188"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L52" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L52" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="397.5" y="105.4292">eee : E&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="383.5" y="110.0234"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="112.0234"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L54" target="_top" title="ggg" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00028/t00028.cc#L54" xlink:show="new" xlink:title="ggg" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="397.5" y="118.2339">ggg : G **</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="628.5" y1="124.8281" y2="124.8281"/>
     <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="385.5" y="132.8281"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="82" x="397.5" y="139.0386">R(C &amp; c) : void</text>
-    <path d="M664.5,64.5 L664.5,73 L629.79,77 L664.5,81 L664.5,89.6328 A0,0 0 0 0 664.5,89.6328 L766.5,89.6328 A0,0 0 0 0 766.5,89.6328 L766.5,74.5 L756.5,64.5 L664.5,64.5 A0,0 0 0 0 664.5,64.5 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M664.5,64.5 L664.5,73 L629.79,77 L664.5,81 L664.5,89.6328 A0,0 0 0 0 664.5,89.6328 L766.5,89.6328 A0,0 0 0 0 766.5,89.6328 L766.5,74.5 L756.5,64.5 L664.5,64.5 A0,0 0 0 0 664.5,64.5 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M756.5,64.5 L756.5,74.5 L766.5,74.5 L756.5,64.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="670.5" y="81.5669">R class note.</text>
-    <path d="M144.5,42 L144.5,67.1328 A0,0 0 0 0 144.5,67.1328 L342.5,67.1328 A0,0 0 0 0 342.5,67.1328 L342.5,60 L381.5,50.4023 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M144.5,42 L144.5,67.1328 A0,0 0 0 0 144.5,67.1328 L342.5,67.1328 A0,0 0 0 0 342.5,67.1328 L342.5,60 L381.5,50.4023 L342.5,52 L342.5,52 L332.5,42 L144.5,42 A0,0 0 0 0 144.5,42 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M332.5,42 L332.5,52 L342.5,52 L332.5,42 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="177" x="150.5" y="59.0669">R contains an instance of A.</text>
-    <path d="M144.5,77.1328 L144.5,102.2656 A0,0 0 0 0 144.5,102.2656 L263.5,102.2656 A0,0 0 0 0 263.5,102.2656 L263.5,95.1328 L381.5,76.0117 L263.5,87.1328 L263.5,87.1328 L253.5,77.1328 L144.5,77.1328 A0,0 0 0 0 144.5,77.1328 " fill="#FBFB77" filter="url(#fpk991h2x65i8)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M144.5,77.1328 L144.5,102.2656 A0,0 0 0 0 144.5,102.2656 L263.5,102.2656 A0,0 0 0 0 263.5,102.2656 L263.5,95.1328 L381.5,76.0117 L263.5,87.1328 L263.5,87.1328 L253.5,77.1328 L144.5,77.1328 A0,0 0 0 0 144.5,77.1328 " fill="#FBFB77" filter="url(#f1npcdx76y94ar)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M253.5,77.1328 L253.5,87.1328 L263.5,87.1328 L253.5,77.1328 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="150.5" y="94.1997">Reference to C.</text>
     <path d="M557.17,274.62 C563.23,287.75 571.06,304.71 578.39,320.59 " fill="none" id="C_0001949673179441298667-&gt;C_0001014136565447389473" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t00029.md b/docs/test_cases/t00029.md
index fd3386b0..f050f6b1 100644
--- a/docs/test_cases/t00029.md
+++ b/docs/test_cases/t00029.md
@@ -69,3 +69,239 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00029_class](./t00029_class.svg "PlantUML skip decorator test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00029::A",
+      "id": "1970994826766369014",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00029",
+      "source_location": {
+        "file": "../../tests/t00029/t00029.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00029::C<T>",
+      "id": "543766389270348470",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "param",
+          "source_location": {
+            "file": "../../tests/t00029/t00029.cc",
+            "line": 13
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00029",
+      "source_location": {
+        "file": "../../tests/t00029/t00029.cc",
+        "line": 12
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "one",
+        "two",
+        "three"
+      ],
+      "display_name": "clanguml::t00029::E",
+      "id": "1936873082456592219",
+      "is_nested": false,
+      "name": "E",
+      "namespace": "clanguml::t00029",
+      "source_location": {
+        "file": "../../tests/t00029/t00029.cc",
+        "line": 21
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00029::G1",
+      "id": "1980718063838190763",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G1",
+      "namespace": "clanguml::t00029",
+      "source_location": {
+        "file": "../../tests/t00029/t00029.cc",
+        "line": 26
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00029::G2",
+      "id": "2204627213593766591",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G2",
+      "namespace": "clanguml::t00029",
+      "source_location": {
+        "file": "../../tests/t00029/t00029.cc",
+        "line": 28
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00029::G3",
+      "id": "767180516665070631",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G3",
+      "namespace": "clanguml::t00029",
+      "source_location": {
+        "file": "../../tests/t00029/t00029.cc",
+        "line": 30
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00029::G4",
+      "id": "715074622924270214",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G4",
+      "namespace": "clanguml::t00029",
+      "source_location": {
+        "file": "../../tests/t00029/t00029.cc",
+        "line": 32
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00029::R",
+      "id": "348749731659902910",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "g1",
+          "source_location": {
+            "file": "../../tests/t00029/t00029.cc",
+            "line": 35
+          },
+          "type": "clanguml::t00029::G1"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "\\uml{skiprelationship}",
+            "raw": "/// \\uml{skiprelationship}"
+          },
+          "is_static": false,
+          "name": "g3",
+          "source_location": {
+            "file": "../../tests/t00029/t00029.cc",
+            "line": 41
+          },
+          "type": "clanguml::t00029::G3 &"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "g4",
+          "source_location": {
+            "file": "../../tests/t00029/t00029.cc",
+            "line": 43
+          },
+          "type": "std::shared_ptr<G4>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00029",
+      "source_location": {
+        "file": "../../tests/t00029/t00029.cc",
+        "line": 34
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00029_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1980718063838190763",
+      "label": "g1",
+      "source": "348749731659902910",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "715074622924270214",
+      "label": "g4",
+      "source": "348749731659902910",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00029"
+}
+```
diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg
index 37ac1cd7..52a0ca38 100644
--- a/docs/test_cases/t00029_class.svg
+++ b/docs/test_cases/t00029_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="230px" preserveAspectRatio="none" style="width:464px;height:230px;" version="1.1" viewBox="0 0 464 230" width="464px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1lfb2cyvq6o0k" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fwsdf9r5ekv5s" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lfb2cyvq6o0k)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="10.5" y="27"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdf9r5ekv5s)" height="48" id="C_0001970994826766369014" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="10.5" y="27"/>
       <ellipse cx="25.5" cy="43" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M28.4688,48.6406 Q27.8906,48.9375 27.25,49.0781 Q26.6094,49.2344 25.9063,49.2344 Q23.4063,49.2344 22.0781,47.5938 Q20.7656,45.9375 20.7656,42.8125 Q20.7656,39.6875 22.0781,38.0313 Q23.4063,36.375 25.9063,36.375 Q26.6094,36.375 27.25,36.5313 Q27.9063,36.6875 28.4688,36.9844 L28.4688,39.7031 Q27.8438,39.125 27.25,38.8594 Q26.6563,38.5781 26.0313,38.5781 Q24.6875,38.5781 24,39.6563 Q23.3125,40.7188 23.3125,42.8125 Q23.3125,44.9063 24,45.9844 Q24.6875,47.0469 26.0313,47.0469 Q26.6563,47.0469 27.25,46.7813 Q27.8438,46.5 28.4688,45.9219 L28.4688,48.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="39.5" y="47.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="11.5" x2="49.5" y1="59" y2="59"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="11.5" x2="49.5" y1="67" y2="67"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lfb2cyvq6o0k)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="85.5" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L12" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L12" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdf9r5ekv5s)" height="60.8047" id="C_0000543766389270348470" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="85.5" y="20.5"/>
       <ellipse cx="114.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M117.4188,42.1406 Q116.8406,42.4375 116.2,42.5781 Q115.5594,42.7344 114.8563,42.7344 Q112.3563,42.7344 111.0281,41.0938 Q109.7156,39.4375 109.7156,36.3125 Q109.7156,33.1875 111.0281,31.5313 Q112.3563,29.875 114.8563,29.875 Q115.5594,29.875 116.2,30.0313 Q116.8563,30.1875 117.4188,30.4844 L117.4188,33.2031 Q116.7938,32.625 116.2,32.3594 Q115.6063,32.0781 114.9813,32.0781 Q113.6375,32.0781 112.95,33.1563 Q112.2625,34.2188 112.2625,36.3125 Q112.2625,38.4063 112.95,39.4844 Q113.6375,40.5469 114.9813,40.5469 Q115.6063,40.5469 116.2,40.2813 Q116.7938,40 117.4188,39.4219 L117.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="131.55" y="40.6543">C</text>
@@ -26,16 +26,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="162.5" y="29.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="52.5" y2="52.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="91.5" y="58.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="93.5" y="60.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L13" target="_top" title="param" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L13" xlink:show="new" xlink:title="param" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="105.5" y="66.7104">param : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="86.5" x2="166.5" y1="73.3047" y2="73.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lfb2cyvq6o0k)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="202.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdf9r5ekv5s)" height="86.4141" id="C_0001936873082456592219" style="stroke: #A80036; stroke-width: 1.5;" width="42" x="202.5" y="8"/>
       <ellipse cx="218.4" cy="24" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.5094,30 L214.7906,30 L214.7906,17.6094 L222.5094,17.6094 L222.5094,19.7656 L217.2438,19.7656 L217.2438,22.4375 L222.0094,22.4375 L222.0094,24.5938 L217.2438,24.5938 L217.2438,27.8438 L222.5094,27.8438 L222.5094,30 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="232.6" y="28.1543">E</text>
@@ -45,64 +45,64 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="208.5" y="79.8198">three</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="203.5" x2="243.5" y1="86.4141" y2="86.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lfb2cyvq6o0k)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="300" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L26" target="_top" title="G1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L26" xlink:show="new" xlink:title="G1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdf9r5ekv5s)" height="48" id="C_0001980718063838190763" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="300" y="171"/>
       <ellipse cx="315" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M317.9688,192.6406 Q317.3906,192.9375 316.75,193.0781 Q316.1094,193.2344 315.4063,193.2344 Q312.9063,193.2344 311.5781,191.5938 Q310.2656,189.9375 310.2656,186.8125 Q310.2656,183.6875 311.5781,182.0313 Q312.9063,180.375 315.4063,180.375 Q316.1094,180.375 316.75,180.5313 Q317.4063,180.6875 317.9688,180.9844 L317.9688,183.7031 Q317.3438,183.125 316.75,182.8594 Q316.1563,182.5781 315.5313,182.5781 Q314.1875,182.5781 313.5,183.6563 Q312.8125,184.7188 312.8125,186.8125 Q312.8125,188.9063 313.5,189.9844 Q314.1875,191.0469 315.5313,191.0469 Q316.1563,191.0469 316.75,190.7813 Q317.3438,190.5 317.9688,189.9219 L317.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="329" y="191.1543">G1</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="301" x2="348" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="301" x2="348" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lfb2cyvq6o0k)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L28" target="_top" title="G2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L28" xlink:show="new" xlink:title="G2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdf9r5ekv5s)" height="48" id="C_0002204627213593766591" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="171"/>
       <ellipse cx="21" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,192.6406 Q23.3906,192.9375 22.75,193.0781 Q22.1094,193.2344 21.4063,193.2344 Q18.9063,193.2344 17.5781,191.5938 Q16.2656,189.9375 16.2656,186.8125 Q16.2656,183.6875 17.5781,182.0313 Q18.9063,180.375 21.4063,180.375 Q22.1094,180.375 22.75,180.5313 Q23.4063,180.6875 23.9688,180.9844 L23.9688,183.7031 Q23.3438,183.125 22.75,182.8594 Q22.1563,182.5781 21.5313,182.5781 Q20.1875,182.5781 19.5,183.6563 Q18.8125,184.7188 18.8125,186.8125 Q18.8125,188.9063 19.5,189.9844 Q20.1875,191.0469 21.5313,191.0469 Q22.1563,191.0469 22.75,190.7813 Q23.3438,190.5 23.9688,189.9219 L23.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="191.1543">G2</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lfb2cyvq6o0k)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="90" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L30" target="_top" title="G3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L30" xlink:show="new" xlink:title="G3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdf9r5ekv5s)" height="48" id="C_0000767180516665070631" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="90" y="171"/>
       <ellipse cx="105" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,192.6406 Q107.3906,192.9375 106.75,193.0781 Q106.1094,193.2344 105.4063,193.2344 Q102.9063,193.2344 101.5781,191.5938 Q100.2656,189.9375 100.2656,186.8125 Q100.2656,183.6875 101.5781,182.0313 Q102.9063,180.375 105.4063,180.375 Q106.1094,180.375 106.75,180.5313 Q107.4063,180.6875 107.9688,180.9844 L107.9688,183.7031 Q107.3438,183.125 106.75,182.8594 Q106.1563,182.5781 105.5313,182.5781 Q104.1875,182.5781 103.5,183.6563 Q102.8125,184.7188 102.8125,186.8125 Q102.8125,188.9063 103.5,189.9844 Q104.1875,191.0469 105.5313,191.0469 Q106.1563,191.0469 106.75,190.7813 Q107.3438,190.5 107.9688,189.9219 L107.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="119" y="191.1543">G3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="138" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="138" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lfb2cyvq6o0k)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="384" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L32" target="_top" title="G4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L32" xlink:show="new" xlink:title="G4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdf9r5ekv5s)" height="48" id="C_0000715074622924270214" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="384" y="171"/>
       <ellipse cx="399" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M401.9688,192.6406 Q401.3906,192.9375 400.75,193.0781 Q400.1094,193.2344 399.4063,193.2344 Q396.9063,193.2344 395.5781,191.5938 Q394.2656,189.9375 394.2656,186.8125 Q394.2656,183.6875 395.5781,182.0313 Q396.9063,180.375 399.4063,180.375 Q400.1094,180.375 400.75,180.5313 Q401.4063,180.6875 401.9688,180.9844 L401.9688,183.7031 Q401.3438,183.125 400.75,182.8594 Q400.1563,182.5781 399.5313,182.5781 Q398.1875,182.5781 397.5,183.6563 Q396.8125,184.7188 396.8125,186.8125 Q396.8125,188.9063 397.5,189.9844 Q398.1875,191.0469 399.5313,191.0469 Q400.1563,191.0469 400.75,190.7813 Q401.3438,190.5 401.9688,189.9219 L401.9688,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="413" y="191.1543">G4</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385" x2="432" y1="203" y2="203"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385" x2="432" y1="211" y2="211"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1lfb2cyvq6o0k)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="279.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L34" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L34" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fwsdf9r5ekv5s)" height="86.4141" id="C_0000348749731659902910" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="279.5" y="8"/>
       <ellipse cx="358.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M361.2188,29.6406 Q360.6406,29.9375 360,30.0781 Q359.3594,30.2344 358.6563,30.2344 Q356.1563,30.2344 354.8281,28.5938 Q353.5156,26.9375 353.5156,23.8125 Q353.5156,20.6875 354.8281,19.0313 Q356.1563,17.375 358.6563,17.375 Q359.3594,17.375 360,17.5313 Q360.6563,17.6875 361.2188,17.9844 L361.2188,20.7031 Q360.5938,20.125 360,19.8594 Q359.4063,19.5781 358.7813,19.5781 Q357.4375,19.5781 356.75,20.6563 Q356.0625,21.7188 356.0625,23.8125 Q356.0625,25.9063 356.75,26.9844 Q357.4375,28.0469 358.7813,28.0469 Q359.4063,28.0469 360,27.7813 Q360.5938,27.5 361.2188,26.9219 L361.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="378.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="46"/>
       <ellipse cx="290.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L35" target="_top" title="g1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L35" xlink:show="new" xlink:title="g1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="299.5" y="54.2104">g1 : G1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="58.8047"/>
       <ellipse cx="290.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L41" target="_top" title="g3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L41" xlink:show="new" xlink:title="g3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="299.5" y="67.0151">g3 : G3 &amp;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="285.5" y="71.6094"/>
       <ellipse cx="290.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L43" target="_top" title="g4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00029/t00029.cc#L43" xlink:show="new" xlink:title="g4" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="299.5" y="79.8198">g4 : std::shared_ptr&lt;G4&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="280.5" x2="452.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00030.md b/docs/test_cases/t00030.md
index 235fc4c2..363006df 100644
--- a/docs/test_cases/t00030.md
+++ b/docs/test_cases/t00030.md
@@ -57,3 +57,247 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00030_class](./t00030_class.svg "PlantUML relationship decorators test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00030::A",
+      "id": "64769484767514424",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00030",
+      "source_location": {
+        "file": "../../tests/t00030/t00030.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00030::B",
+      "id": "156923198106222307",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00030",
+      "source_location": {
+        "file": "../../tests/t00030/t00030.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00030::C",
+      "id": "1651557398557662399",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00030",
+      "source_location": {
+        "file": "../../tests/t00030/t00030.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00030::D",
+      "id": "1089781072752262158",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00030",
+      "source_location": {
+        "file": "../../tests/t00030/t00030.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00030::E",
+      "id": "425964641881054607",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00030",
+      "source_location": {
+        "file": "../../tests/t00030/t00030.cc",
+        "line": 15
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00030::R",
+      "id": "263468735940481091",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{association[]}",
+            "raw": "/// @uml{association[]}"
+          },
+          "is_static": false,
+          "name": "aaa",
+          "source_location": {
+            "file": "../../tests/t00030/t00030.cc",
+            "line": 19
+          },
+          "type": "clanguml::t00030::A"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{composition[0..1:1..*]}",
+            "raw": "/// @uml{composition[0..1:1..*]}"
+          },
+          "is_static": false,
+          "name": "bbb",
+          "source_location": {
+            "file": "../../tests/t00030/t00030.cc",
+            "line": 22
+          },
+          "type": "std::vector<B>"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{aggregation[0..1:1..5]}",
+            "raw": "/// @uml{aggregation[0..1:1..5]}"
+          },
+          "is_static": false,
+          "name": "ccc",
+          "source_location": {
+            "file": "../../tests/t00030/t00030.cc",
+            "line": 25
+          },
+          "type": "std::vector<C>"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{association[:1]}",
+            "raw": "/// @uml{association[:1]}"
+          },
+          "is_static": false,
+          "name": "ddd",
+          "source_location": {
+            "file": "../../tests/t00030/t00030.cc",
+            "line": 28
+          },
+          "type": "clanguml::t00030::D"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{aggregation[:1]}",
+            "raw": "/// @uml{aggregation[:1]}"
+          },
+          "is_static": false,
+          "name": "eee",
+          "source_location": {
+            "file": "../../tests/t00030/t00030.cc",
+            "line": 31
+          },
+          "type": "clanguml::t00030::E *"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00030",
+      "source_location": {
+        "file": "../../tests/t00030/t00030.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00030_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "64769484767514424",
+      "label": "aaa",
+      "source": "263468735940481091",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "156923198106222307",
+      "label": "bbb",
+      "multiplicity_destination": "1..*",
+      "multiplicity_source": "0..1",
+      "source": "263468735940481091",
+      "type": "composition"
+    },
+    {
+      "access": "public",
+      "destination": "1651557398557662399",
+      "label": "ccc",
+      "multiplicity_destination": "1..5",
+      "multiplicity_source": "0..1",
+      "source": "263468735940481091",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1089781072752262158",
+      "label": "ddd",
+      "multiplicity_destination": "1",
+      "source": "263468735940481091",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "425964641881054607",
+      "label": "eee",
+      "multiplicity_destination": "1",
+      "source": "263468735940481091",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00030"
+}
+```
diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg
index 9f96f86d..d3656053 100644
--- a/docs/test_cases/t00030_class.svg
+++ b/docs/test_cases/t00030_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="256px" preserveAspectRatio="none" style="width:366px;height:256px;" version="1.1" viewBox="0 0 366 256" width="366px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fbpqzu61xruex" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fqxfnvat8dm4y" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,86 +9,86 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbpqzu61xruex)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqxfnvat8dm4y)" height="48" id="C_0000064769484767514424" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="197"/>
       <ellipse cx="21" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,218.6406 Q23.3906,218.9375 22.75,219.0781 Q22.1094,219.2344 21.4063,219.2344 Q18.9063,219.2344 17.5781,217.5938 Q16.2656,215.9375 16.2656,212.8125 Q16.2656,209.6875 17.5781,208.0313 Q18.9063,206.375 21.4063,206.375 Q22.1094,206.375 22.75,206.5313 Q23.4063,206.6875 23.9688,206.9844 L23.9688,209.7031 Q23.3438,209.125 22.75,208.8594 Q22.1563,208.5781 21.5313,208.5781 Q20.1875,208.5781 19.5,209.6563 Q18.8125,210.7188 18.8125,212.8125 Q18.8125,214.9063 19.5,215.9844 Q20.1875,217.0469 21.5313,217.0469 Q22.1563,217.0469 22.75,216.7813 Q23.3438,216.5 23.9688,215.9219 L23.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbpqzu61xruex)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L9" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L9" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqxfnvat8dm4y)" height="48" id="C_0000156923198106222307" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="84" y="197"/>
       <ellipse cx="99" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.9688,218.6406 Q101.3906,218.9375 100.75,219.0781 Q100.1094,219.2344 99.4063,219.2344 Q96.9063,219.2344 95.5781,217.5938 Q94.2656,215.9375 94.2656,212.8125 Q94.2656,209.6875 95.5781,208.0313 Q96.9063,206.375 99.4063,206.375 Q100.1094,206.375 100.75,206.5313 Q101.4063,206.6875 101.9688,206.9844 L101.9688,209.7031 Q101.3438,209.125 100.75,208.8594 Q100.1563,208.5781 99.5313,208.5781 Q98.1875,208.5781 97.5,209.6563 Q96.8125,210.7188 96.8125,212.8125 Q96.8125,214.9063 97.5,215.9844 Q98.1875,217.0469 99.5313,217.0469 Q100.1563,217.0469 100.75,216.7813 Q101.3438,216.5 101.9688,215.9219 L101.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113" y="217.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="85" x2="123" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbpqzu61xruex)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L11" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L11" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqxfnvat8dm4y)" height="48" id="C_0001651557398557662399" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="161" y="197"/>
       <ellipse cx="176" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M178.9688,218.6406 Q178.3906,218.9375 177.75,219.0781 Q177.1094,219.2344 176.4063,219.2344 Q173.9063,219.2344 172.5781,217.5938 Q171.2656,215.9375 171.2656,212.8125 Q171.2656,209.6875 172.5781,208.0313 Q173.9063,206.375 176.4063,206.375 Q177.1094,206.375 177.75,206.5313 Q178.4063,206.6875 178.9688,206.9844 L178.9688,209.7031 Q178.3438,209.125 177.75,208.8594 Q177.1563,208.5781 176.5313,208.5781 Q175.1875,208.5781 174.5,209.6563 Q173.8125,210.7188 173.8125,212.8125 Q173.8125,214.9063 174.5,215.9844 Q175.1875,217.0469 176.5313,217.0469 Q177.1563,217.0469 177.75,216.7813 Q178.3438,216.5 178.9688,215.9219 L178.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="190" y="217.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162" x2="200" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbpqzu61xruex)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqxfnvat8dm4y)" height="48" id="C_0001089781072752262158" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="236.5" y="197"/>
       <ellipse cx="251.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M254.4688,218.6406 Q253.8906,218.9375 253.25,219.0781 Q252.6094,219.2344 251.9063,219.2344 Q249.4063,219.2344 248.0781,217.5938 Q246.7656,215.9375 246.7656,212.8125 Q246.7656,209.6875 248.0781,208.0313 Q249.4063,206.375 251.9063,206.375 Q252.6094,206.375 253.25,206.5313 Q253.9063,206.6875 254.4688,206.9844 L254.4688,209.7031 Q253.8438,209.125 253.25,208.8594 Q252.6563,208.5781 252.0313,208.5781 Q250.6875,208.5781 250,209.6563 Q249.3125,210.7188 249.3125,212.8125 Q249.3125,214.9063 250,215.9844 Q250.6875,217.0469 252.0313,217.0469 Q252.6563,217.0469 253.25,216.7813 Q253.8438,216.5 254.4688,215.9219 L254.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="265.5" y="217.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="237.5" x2="276.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbpqzu61xruex)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqxfnvat8dm4y)" height="48" id="C_0000425964641881054607" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="315" y="197"/>
       <ellipse cx="330" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M332.9688,218.6406 Q332.3906,218.9375 331.75,219.0781 Q331.1094,219.2344 330.4063,219.2344 Q327.9063,219.2344 326.5781,217.5938 Q325.2656,215.9375 325.2656,212.8125 Q325.2656,209.6875 326.5781,208.0313 Q327.9063,206.375 330.4063,206.375 Q331.1094,206.375 331.75,206.5313 Q332.4063,206.6875 332.9688,206.9844 L332.9688,209.7031 Q332.3438,209.125 331.75,208.8594 Q331.1563,208.5781 330.5313,208.5781 Q329.1875,208.5781 328.5,209.6563 Q327.8125,210.7188 327.8125,212.8125 Q327.8125,214.9063 328.5,215.9844 Q329.1875,217.0469 330.5313,217.0469 Q331.1563,217.0469 331.75,216.7813 Q332.3438,216.5 332.9688,215.9219 L332.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="344" y="217.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="316" x2="354" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fbpqzu61xruex)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L17" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L17" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fqxfnvat8dm4y)" height="112.0234" id="C_0000263468735940481091" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="109" y="8"/>
       <ellipse cx="173.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M176.7188,29.6406 Q176.1406,29.9375 175.5,30.0781 Q174.8594,30.2344 174.1563,30.2344 Q171.6563,30.2344 170.3281,28.5938 Q169.0156,26.9375 169.0156,23.8125 Q169.0156,20.6875 170.3281,19.0313 Q171.6563,17.375 174.1563,17.375 Q174.8594,17.375 175.5,17.5313 Q176.1563,17.6875 176.7188,17.9844 L176.7188,20.7031 Q176.0938,20.125 175.5,19.8594 Q174.9063,19.5781 174.2813,19.5781 Q172.9375,19.5781 172.25,20.6563 Q171.5625,21.7188 171.5625,23.8125 Q171.5625,25.9063 172.25,26.9844 Q172.9375,28.0469 174.2813,28.0469 Q174.9063,28.0469 175.5,27.7813 Q176.0938,27.5 176.7188,26.9219 L176.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="194.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="46"/>
       <ellipse cx="120" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L19" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L19" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="129" y="54.2104">aaa : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="58.8047"/>
       <ellipse cx="120" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L22" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L22" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="129" y="67.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="71.6094"/>
       <ellipse cx="120" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L25" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L25" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="117" x="129" y="79.8198">ccc : std::vector&lt;C&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="84.4141"/>
       <ellipse cx="120" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L28" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L28" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="41" x="129" y="92.6245">ddd : D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="115" y="97.2188"/>
       <ellipse cx="120" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L31" target="_top" title="eee" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00030/t00030.cc#L31" xlink:show="new" xlink:title="eee" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="129" y="105.4292">eee : E *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="110" x2="254" y1="112.0234" y2="112.0234"/>
diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md
index bc874f5a..d45fc832 100644
--- a/docs/test_cases/t00031.md
+++ b/docs/test_cases/t00031.md
@@ -58,3 +58,256 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00031_class](./t00031_class.svg "PlantUML style decorator test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "@uml{style[#back:lightgreen|yellow;header:blue/red]}",
+        "raw": "/// @uml{style[#back:lightgreen|yellow;header:blue/red]}"
+      },
+      "display_name": "clanguml::t00031::A",
+      "id": "847775539502907247",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00031",
+      "source_location": {
+        "file": "../../tests/t00031/t00031.cc",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "comment": {
+        "formatted": "@uml{style[#line.dotted:blue]}",
+        "raw": "/// @uml{style[#line.dotted:blue]}"
+      },
+      "constants": [
+        "one",
+        "two",
+        "three"
+      ],
+      "display_name": "clanguml::t00031::B",
+      "id": "1441796358326382179",
+      "is_nested": false,
+      "name": "B",
+      "namespace": "clanguml::t00031",
+      "source_location": {
+        "file": "../../tests/t00031/t00031.cc",
+        "line": 11
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "@uml{style[#pink;line:red;line.bold;text:red]}",
+        "raw": "/// @uml{style[#pink;line:red;line.bold;text:red]}"
+      },
+      "display_name": "clanguml::t00031::C<T>",
+      "id": "116209144733282955",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "ttt",
+          "source_location": {
+            "file": "../../tests/t00031/t00031.cc",
+            "line": 15
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00031",
+      "source_location": {
+        "file": "../../tests/t00031/t00031.cc",
+        "line": 14
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00031::D",
+      "id": "2266534344475505157",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00031",
+      "source_location": {
+        "file": "../../tests/t00031/t00031.cc",
+        "line": 18
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00031::C<int>",
+      "id": "208700529175860645",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00031",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00031::R",
+      "id": "484712092364868032",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{style[#red,dashed,thickness=2]}",
+            "raw": "/// @uml{style[#red,dashed,thickness=2]}"
+          },
+          "is_static": false,
+          "name": "aaa",
+          "source_location": {
+            "file": "../../tests/t00031/t00031.cc",
+            "line": 22
+          },
+          "type": "clanguml::t00031::A *"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{composition}\n@uml{style[#green,dashed,thickness=4]}",
+            "raw": "/// @uml{composition}\n    /// @uml{style[#green,dashed,thickness=4]}"
+          },
+          "is_static": false,
+          "name": "bbb",
+          "source_location": {
+            "file": "../../tests/t00031/t00031.cc",
+            "line": 26
+          },
+          "type": "std::vector<B>"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{style[#blue,dotted,thickness=8]}",
+            "raw": "/// @uml{style[#blue,dotted,thickness=8]}"
+          },
+          "is_static": false,
+          "name": "ccc",
+          "source_location": {
+            "file": "../../tests/t00031/t00031.cc",
+            "line": 29
+          },
+          "type": "C<int>"
+        },
+        {
+          "access": "public",
+          "comment": {
+            "formatted": "@uml{style[#blue,plain,thickness=16]}",
+            "raw": "/// @uml{style[#blue,plain,thickness=16]}"
+          },
+          "is_static": false,
+          "name": "ddd",
+          "source_location": {
+            "file": "../../tests/t00031/t00031.cc",
+            "line": 32
+          },
+          "type": "clanguml::t00031::D *"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00031",
+      "source_location": {
+        "file": "../../tests/t00031/t00031.cc",
+        "line": 20
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00031_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "116209144733282955",
+      "source": "208700529175860645",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "847775539502907247",
+      "label": "aaa",
+      "source": "484712092364868032",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1441796358326382179",
+      "label": "bbb",
+      "source": "484712092364868032",
+      "type": "composition"
+    },
+    {
+      "access": "public",
+      "destination": "208700529175860645",
+      "label": "ccc",
+      "source": "484712092364868032",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "2266534344475505157",
+      "label": "ddd",
+      "source": "484712092364868032",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00031"
+}
+```
diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg
index 5ada614f..facc4534 100644
--- a/docs/test_cases/t00031_class.svg
+++ b/docs/test_cases/t00031_class.svg
@@ -1,33 +1,33 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:312px;height:402px;" version="1.1" viewBox="0 0 312 402" width="312px" zoomAndPan="magnify">
   <defs>
-    <linearGradient id="g1i8da2jdqgiod0" x1="0%" x2="100%" y1="50%" y2="50%">
+    <linearGradient id="g1eqh8n04dtbg70" x1="0%" x2="100%" y1="50%" y2="50%">
       <stop offset="0%" stop-color="#90EE90"/>
       <stop offset="100%" stop-color="#FFFF00"/>
     </linearGradient>
-    <filter height="300%" id="f1i8da2jdqgiod" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1eqh8n04dtbg7" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
       <feBlend in="SourceGraphic" in2="blurOut3" mode="normal"/>
     </filter>
-    <linearGradient id="g1i8da2jdqgiod1" x1="0%" x2="100%" y1="0%" y2="100%">
+    <linearGradient id="g1eqh8n04dtbg71" x1="0%" x2="100%" y1="0%" y2="100%">
       <stop offset="0%" stop-color="#0000FF"/>
       <stop offset="100%" stop-color="#FF0000"/>
     </linearGradient>
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="url(#g1i8da2jdqgiod0)" filter="url(#f1i8da2jdqgiod)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
-      <rect fill="url(#g1i8da2jdqgiod1)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="url(#g1eqh8n04dtbg70)" filter="url(#f1eqh8n04dtbg7)" height="48" id="C_0000847775539502907247" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
+      <rect fill="url(#g1eqh8n04dtbg71)" height="32" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="203"/>
       <ellipse cx="21" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,224.6406 Q23.3906,224.9375 22.75,225.0781 Q22.1094,225.2344 21.4063,225.2344 Q18.9063,225.2344 17.5781,223.5938 Q16.2656,221.9375 16.2656,218.8125 Q16.2656,215.6875 17.5781,214.0313 Q18.9063,212.375 21.4063,212.375 Q22.1094,212.375 22.75,212.5313 Q23.4063,212.6875 23.9688,212.9844 L23.9688,215.7031 Q23.3438,215.125 22.75,214.8594 Q22.1563,214.5781 21.5313,214.5781 Q20.1875,214.5781 19.5,215.6563 Q18.8125,216.7188 18.8125,218.8125 Q18.8125,220.9063 19.5,221.9844 Q20.1875,223.0469 21.5313,223.0469 Q22.1563,223.0469 22.75,222.7813 Q23.3438,222.5 23.9688,221.9219 L23.9688,224.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="223.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="235" y2="235"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="243" y2="243"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i8da2jdqgiod)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="83" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1eqh8n04dtbg7)" height="86.4141" id="C_0001441796358326382179" style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" width="42" x="83" y="184"/>
       <ellipse cx="98.9" cy="200" fill="#EB937F" rx="11" ry="11" style="stroke: #0000FF; stroke-width: 1.0;"/>
       <path d="M103.0094,206 L95.2906,206 L95.2906,193.6094 L103.0094,193.6094 L103.0094,195.7656 L97.7438,195.7656 L97.7438,198.4375 L102.5094,198.4375 L102.5094,200.5938 L97.7438,200.5938 L97.7438,203.8438 L103.0094,203.8438 L103.0094,206 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.1" y="204.1543">B</text>
@@ -37,8 +37,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="30" x="89" y="255.8198">three</text>
       <line style="stroke: #0000FF; stroke-width: 1.0; stroke-dasharray: 1.0,3.0;" x1="84" x2="124" y1="262.4141" y2="262.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FFC0CB" filter="url(#f1i8da2jdqgiod)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FFC0CB" filter="url(#f1eqh8n04dtbg7)" height="60.8047" id="C_0000116209144733282955" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
       <rect fill="#FFC0CB" height="32" style="stroke: #FF0000; stroke-width: 2.0;" width="57" x="239.5" y="331"/>
       <ellipse cx="257.2" cy="347" fill="#ADD1B2" rx="11" ry="11" style="stroke: #FF0000; stroke-width: 1.0;"/>
       <path d="M260.1688,352.6406 Q259.5906,352.9375 258.95,353.0781 Q258.3094,353.2344 257.6063,353.2344 Q255.1063,353.2344 253.7781,351.5938 Q252.4656,349.9375 252.4656,346.8125 Q252.4656,343.6875 253.7781,342.0313 Q255.1063,340.375 257.6063,340.375 Q258.3094,340.375 258.95,340.5313 Q259.6063,340.6875 260.1688,340.9844 L260.1688,343.7031 Q259.5438,343.125 258.95,342.8594 Q258.3563,342.5781 257.7313,342.5781 Q256.3875,342.5781 255.7,343.6563 Q255.0125,344.7188 255.0125,346.8125 Q255.0125,348.9063 255.7,349.9844 Q256.3875,351.0469 257.7313,351.0469 Q258.3563,351.0469 258.95,350.7813 Q259.5438,350.5 260.1688,349.9219 L260.1688,352.6406 Z "/>
@@ -47,23 +47,23 @@
       <text fill="#FF0000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="291.5" y="340.1387">T</text>
       <line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="363" y2="363"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <rect fill="#FFC0CB" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="245.5" y="369"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="247.5" y="371"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L15" target="_top" title="ttt" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L15" xlink:show="new" xlink:title="ttt" xlink:type="simple">
       <text fill="#FF0000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="259.5" y="377.2104">ttt : T</text>
     </a>
     <line style="stroke: #FF0000; stroke-width: 2.0;" x1="240.5" x2="295.5" y1="383.8047" y2="383.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i8da2jdqgiod)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="161.5" y="203"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1eqh8n04dtbg7)" height="48" id="C_0002266534344475505157" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="161.5" y="203"/>
       <ellipse cx="176.5" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M179.4688,224.6406 Q178.8906,224.9375 178.25,225.0781 Q177.6094,225.2344 176.9063,225.2344 Q174.4063,225.2344 173.0781,223.5938 Q171.7656,221.9375 171.7656,218.8125 Q171.7656,215.6875 173.0781,214.0313 Q174.4063,212.375 176.9063,212.375 Q177.6094,212.375 178.25,212.5313 Q178.9063,212.6875 179.4688,212.9844 L179.4688,215.7031 Q178.8438,215.125 178.25,214.8594 Q177.6563,214.5781 177.0313,214.5781 Q175.6875,214.5781 175,215.6563 Q174.3125,216.7188 174.3125,218.8125 Q174.3125,220.9063 175,221.9844 Q175.6875,223.0469 177.0313,223.0469 Q177.6563,223.0469 178.25,222.7813 Q178.8438,222.5 179.4688,221.9219 L179.4688,224.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="190.5" y="223.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="235" y2="235"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="201.5" y1="243" y2="243"/>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1i8da2jdqgiod)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="238" y="203"/>
+    <rect fill="#FEFECE" filter="url(#f1eqh8n04dtbg7)" height="48" id="C_0000208700529175860645" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="238" y="203"/>
     <ellipse cx="253" cy="219" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M255.9688,224.6406 Q255.3906,224.9375 254.75,225.0781 Q254.1094,225.2344 253.4063,225.2344 Q250.9063,225.2344 249.5781,223.5938 Q248.2656,221.9375 248.2656,218.8125 Q248.2656,215.6875 249.5781,214.0313 Q250.9063,212.375 253.4063,212.375 Q254.1094,212.375 254.75,212.5313 Q255.4063,212.6875 255.9688,212.9844 L255.9688,215.7031 Q255.3438,215.125 254.75,214.8594 Q254.1563,214.5781 253.5313,214.5781 Q252.1875,214.5781 251.5,215.6563 Q250.8125,216.7188 250.8125,218.8125 Q250.8125,220.9063 251.5,221.9844 Q252.1875,223.0469 253.5313,223.0469 Q254.1563,223.0469 254.75,222.7813 Q255.3438,222.5 255.9688,221.9219 L255.9688,224.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="267" y="223.1543">C</text>
@@ -71,39 +71,39 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="284" y="212.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="235" y2="235"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="239" x2="297" y1="243" y2="243"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1i8da2jdqgiod)" height="99.2188" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L20" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L20" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1eqh8n04dtbg7)" height="99.2188" id="C_0000484712092364868032" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="70" y="8"/>
       <ellipse cx="134.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M137.7188,29.6406 Q137.1406,29.9375 136.5,30.0781 Q135.8594,30.2344 135.1563,30.2344 Q132.6563,30.2344 131.3281,28.5938 Q130.0156,26.9375 130.0156,23.8125 Q130.0156,20.6875 131.3281,19.0313 Q132.6563,17.375 135.1563,17.375 Q135.8594,17.375 136.5,17.5313 Q137.1563,17.6875 137.7188,17.9844 L137.7188,20.7031 Q137.0938,20.125 136.5,19.8594 Q135.9063,19.5781 135.2813,19.5781 Q133.9375,19.5781 133.25,20.6563 Q132.5625,21.7188 132.5625,23.8125 Q132.5625,25.9063 133.25,26.9844 Q133.9375,28.0469 135.2813,28.0469 Q135.9063,28.0469 136.5,27.7813 Q137.0938,27.5 137.7188,26.9219 L137.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="46"/>
       <ellipse cx="81" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L22" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L22" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="50" x="90" y="54.2104">aaa : A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="58.8047"/>
       <ellipse cx="81" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L26" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L26" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="120" x="90" y="67.0151">bbb : std::vector&lt;B&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L29" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L29" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L29" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L29" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="71.6094"/>
       <ellipse cx="81" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L29" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L29" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L29" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L29" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="70" x="90" y="79.8198">ccc : C&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L32" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L32" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L32" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L32" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="76" y="84.4141"/>
       <ellipse cx="81" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L32" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00031/t00031.cc#L32" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L32" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00031/t00031.cc#L32" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="90" y="92.6245">ddd : D *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="71" x2="215" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md
index 4e75128e..1525a0b6 100644
--- a/docs/test_cases/t00032.md
+++ b/docs/test_cases/t00032.md
@@ -58,3 +58,381 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00032_class](./t00032_class.svg "Class template with template base classes test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00032::Base",
+      "id": "1619396229227632210",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Base",
+      "namespace": "clanguml::t00032",
+      "source_location": {
+        "file": "../../tests/t00032/t00032.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00032::TBase",
+      "id": "543776954602127752",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "TBase",
+      "namespace": "clanguml::t00032",
+      "source_location": {
+        "file": "../../tests/t00032/t00032.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00032::A",
+      "id": "687909853333071234",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "operator()",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00032",
+      "source_location": {
+        "file": "../../tests/t00032/t00032.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00032::B",
+      "id": "737235057776029746",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "operator()",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "B",
+      "namespace": "clanguml::t00032",
+      "source_location": {
+        "file": "../../tests/t00032/t00032.cc",
+        "line": 15
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00032::C",
+      "id": "1497964256865073382",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "operator()",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "C",
+      "namespace": "clanguml::t00032",
+      "source_location": {
+        "file": "../../tests/t00032/t00032.cc",
+        "line": 19
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1619396229227632210",
+          "is_virtual": false,
+          "name": "clanguml::t00032::Base"
+        }
+      ],
+      "display_name": "clanguml::t00032::Overload<T,L,Ts...>",
+      "id": "1463422997970691679",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "counter",
+          "source_location": {
+            "file": "../../tests/t00032/t00032.cc",
+            "line": 26
+          },
+          "type": "L"
+        }
+      ],
+      "methods": [],
+      "name": "Overload",
+      "namespace": "clanguml::t00032",
+      "source_location": {
+        "file": "../../tests/t00032/t00032.cc",
+        "line": 24
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "L",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Ts...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "543776954602127752",
+          "is_virtual": false,
+          "name": "clanguml::t00032::TBase"
+        },
+        {
+          "access": "public",
+          "id": "687909853333071234",
+          "is_virtual": false,
+          "name": "clanguml::t00032::A"
+        },
+        {
+          "access": "public",
+          "id": "737235057776029746",
+          "is_virtual": false,
+          "name": "clanguml::t00032::B"
+        },
+        {
+          "access": "public",
+          "id": "1497964256865073382",
+          "is_virtual": false,
+          "name": "clanguml::t00032::C"
+        }
+      ],
+      "display_name": "clanguml::t00032::Overload<clanguml::t00032::TBase,int,clanguml::t00032::A,clanguml::t00032::B,clanguml::t00032::C>",
+      "id": "1706455047176879286",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Overload",
+      "namespace": "clanguml::t00032",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00032::TBase"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00032::A"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00032::B"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00032::C"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00032::R",
+      "id": "85539867332573320",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "overload",
+          "source_location": {
+            "file": "../../tests/t00032/t00032.cc",
+            "line": 32
+          },
+          "type": "Overload<clanguml::t00032::TBase,int,clanguml::t00032::A,clanguml::t00032::B,clanguml::t00032::C>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00032",
+      "source_location": {
+        "file": "../../tests/t00032/t00032.cc",
+        "line": 31
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00032_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1619396229227632210",
+      "source": "1463422997970691679",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "543776954602127752",
+      "source": "1706455047176879286",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "687909853333071234",
+      "source": "1706455047176879286",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "737235057776029746",
+      "source": "1706455047176879286",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1497964256865073382",
+      "source": "1706455047176879286",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1463422997970691679",
+      "source": "1706455047176879286",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "543776954602127752",
+      "source": "1706455047176879286",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "687909853333071234",
+      "source": "1706455047176879286",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "737235057776029746",
+      "source": "1706455047176879286",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1497964256865073382",
+      "source": "1706455047176879286",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1706455047176879286",
+      "label": "overload",
+      "source": "85539867332573320",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00032"
+}
+```
diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg
index 12fc21eb..e77c395a 100644
--- a/docs/test_cases/t00032_class.svg
+++ b/docs/test_cases/t00032_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="326px" preserveAspectRatio="none" style="width:743px;height:326px;" version="1.1" viewBox="0 0 743 326" width="743px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="frglqw9de31o4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fc6r6iirfwxl5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,24 +9,24 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frglqw9de31o4)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="43.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L7" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L7" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc6r6iirfwxl5)" height="48" id="C_0001619396229227632210" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="43.5" y="146"/>
       <ellipse cx="58.5" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M61.4688,167.6406 Q60.8906,167.9375 60.25,168.0781 Q59.6094,168.2344 58.9063,168.2344 Q56.4063,168.2344 55.0781,166.5938 Q53.7656,164.9375 53.7656,161.8125 Q53.7656,158.6875 55.0781,157.0313 Q56.4063,155.375 58.9063,155.375 Q59.6094,155.375 60.25,155.5313 Q60.9063,155.6875 61.4688,155.9844 L61.4688,158.7031 Q60.8438,158.125 60.25,157.8594 Q59.6563,157.5781 59.0313,157.5781 Q57.6875,157.5781 57,158.6563 Q56.3125,159.7188 56.3125,161.8125 Q56.3125,163.9063 57,164.9844 Q57.6875,166.0469 59.0313,166.0469 Q59.6563,166.0469 60.25,165.7813 Q60.8438,165.5 61.4688,164.9219 L61.4688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="31" x="72.5" y="166.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="178" y2="178"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44.5" x2="105.5" y1="186" y2="186"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frglqw9de31o4)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="179" y="261.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L9" target="_top" title="TBase" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L9" xlink:show="new" xlink:title="TBase" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc6r6iirfwxl5)" height="48" id="C_0000543776954602127752" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="179" y="261.5"/>
       <ellipse cx="194" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,283.1406 Q196.3906,283.4375 195.75,283.5781 Q195.1094,283.7344 194.4063,283.7344 Q191.9063,283.7344 190.5781,282.0938 Q189.2656,280.4375 189.2656,277.3125 Q189.2656,274.1875 190.5781,272.5313 Q191.9063,270.875 194.4063,270.875 Q195.1094,270.875 195.75,271.0313 Q196.4063,271.1875 196.9688,271.4844 L196.9688,274.2031 Q196.3438,273.625 195.75,273.3594 Q195.1563,273.0781 194.5313,273.0781 Q193.1875,273.0781 192.5,274.1563 Q191.8125,275.2188 191.8125,277.3125 Q191.8125,279.4063 192.5,280.4844 Q193.1875,281.5469 194.5313,281.5469 Q195.1563,281.5469 195.75,281.2813 Q196.3438,281 196.9688,280.4219 L196.9688,283.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="208" y="281.6543">TBase</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="293.5" y2="293.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="180" x2="248" y1="301.5" y2="301.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frglqw9de31o4)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="284" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc6r6iirfwxl5)" height="60.8047" id="C_0000687909853333071234" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="284" y="255"/>
       <ellipse cx="338.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M341.7188,276.6406 Q341.1406,276.9375 340.5,277.0781 Q339.8594,277.2344 339.1563,277.2344 Q336.6563,277.2344 335.3281,275.5938 Q334.0156,273.9375 334.0156,270.8125 Q334.0156,267.6875 335.3281,266.0313 Q336.6563,264.375 339.1563,264.375 Q339.8594,264.375 340.5,264.5313 Q341.1563,264.6875 341.7188,264.9844 L341.7188,267.7031 Q341.0938,267.125 340.5,266.8594 Q339.9063,266.5781 339.2813,266.5781 Q337.9375,266.5781 337.25,267.6563 Q336.5625,268.7188 336.5625,270.8125 Q336.5625,272.9063 337.25,273.9844 Q337.9375,275.0469 339.2813,275.0469 Q339.9063,275.0469 340.5,274.7813 Q341.0938,274.5 341.7188,273.9219 L341.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="275.1543">A</text>
@@ -35,8 +35,8 @@
       <ellipse cx="295" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="304" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frglqw9de31o4)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="445" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc6r6iirfwxl5)" height="60.8047" id="C_0000737235057776029746" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="445" y="255"/>
       <ellipse cx="499.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M502.7188,276.6406 Q502.1406,276.9375 501.5,277.0781 Q500.8594,277.2344 500.1563,277.2344 Q497.6563,277.2344 496.3281,275.5938 Q495.0156,273.9375 495.0156,270.8125 Q495.0156,267.6875 496.3281,266.0313 Q497.6563,264.375 500.1563,264.375 Q500.8594,264.375 501.5,264.5313 Q502.1563,264.6875 502.7188,264.9844 L502.7188,267.7031 Q502.0938,267.125 501.5,266.8594 Q500.9063,266.5781 500.2813,266.5781 Q498.9375,266.5781 498.25,267.6563 Q497.5625,268.7188 497.5625,270.8125 Q497.5625,272.9063 498.25,273.9844 Q498.9375,275.0469 500.2813,275.0469 Q500.9063,275.0469 501.5,274.7813 Q502.0938,274.5 502.7188,273.9219 L502.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="520.25" y="275.1543">B</text>
@@ -45,8 +45,8 @@
       <ellipse cx="456" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="465" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frglqw9de31o4)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="606" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L19" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L19" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc6r6iirfwxl5)" height="60.8047" id="C_0001497964256865073382" style="stroke: #A80036; stroke-width: 1.5;" width="126" x="606" y="255"/>
       <ellipse cx="660.75" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M663.7188,276.6406 Q663.1406,276.9375 662.5,277.0781 Q661.8594,277.2344 661.1563,277.2344 Q658.6563,277.2344 657.3281,275.5938 Q656.0156,273.9375 656.0156,270.8125 Q656.0156,267.6875 657.3281,266.0313 Q658.6563,264.375 661.1563,264.375 Q661.8594,264.375 662.5,264.5313 Q663.1563,264.6875 663.7188,264.9844 L663.7188,267.7031 Q663.0938,267.125 662.5,266.8594 Q661.9063,266.5781 661.2813,266.5781 Q659.9375,266.5781 659.25,267.6563 Q658.5625,268.7188 658.5625,270.8125 Q658.5625,272.9063 659.25,273.9844 Q659.9375,275.0469 661.2813,275.0469 Q661.9063,275.0469 662.5,274.7813 Q663.0938,274.5 663.7188,273.9219 L663.7188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="681.25" y="275.1543">C</text>
@@ -55,8 +55,8 @@
       <ellipse cx="617" cy="306" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="100" x="626" y="309.2104">operator()() : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frglqw9de31o4)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="6" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L24" target="_top" title="Overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L24" xlink:show="new" xlink:title="Overload" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc6r6iirfwxl5)" height="60.8047" id="C_0001463422997970691679" style="stroke: #A80036; stroke-width: 1.5;" width="138" x="6" y="255"/>
       <ellipse cx="21" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,276.6406 Q23.3906,276.9375 22.75,277.0781 Q22.1094,277.2344 21.4063,277.2344 Q18.9063,277.2344 17.5781,275.5938 Q16.2656,273.9375 16.2656,270.8125 Q16.2656,267.6875 17.5781,266.0313 Q18.9063,264.375 21.4063,264.375 Q22.1094,264.375 22.75,264.5313 Q23.4063,264.6875 23.9688,264.9844 L23.9688,267.7031 Q23.3438,267.125 22.75,266.8594 Q22.1563,266.5781 21.5313,266.5781 Q20.1875,266.5781 19.5,267.6563 Q18.8125,268.7188 18.8125,270.8125 Q18.8125,272.9063 19.5,273.9844 Q20.1875,275.0469 21.5313,275.0469 Q22.1563,275.0469 22.75,274.7813 Q23.3438,274.5 23.9688,273.9219 L23.9688,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="35" y="275.1543">Overload</text>
@@ -64,15 +64,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="47" x="99" y="264.1387">T,L,Ts...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="293"/>
       <ellipse cx="17" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L26" target="_top" title="counter" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L26" xlink:show="new" xlink:title="counter" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="301.2104">counter : L</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="143" y1="307.8047" y2="307.8047"/>
-    <rect fill="#FEFECE" filter="url(#frglqw9de31o4)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="255" y="146"/>
+    <rect fill="#FEFECE" filter="url(#fc6r6iirfwxl5)" height="48" id="C_0001706455047176879286" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="255" y="146"/>
     <ellipse cx="270" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M272.9688,167.6406 Q272.3906,167.9375 271.75,168.0781 Q271.1094,168.2344 270.4063,168.2344 Q267.9063,168.2344 266.5781,166.5938 Q265.2656,164.9375 265.2656,161.8125 Q265.2656,158.6875 266.5781,157.0313 Q267.9063,155.375 270.4063,155.375 Q271.1094,155.375 271.75,155.5313 Q272.4063,155.6875 272.9688,155.9844 L272.9688,158.7031 Q272.3438,158.125 271.75,157.8594 Q271.1563,157.5781 270.5313,157.5781 Q269.1875,157.5781 268.5,158.6563 Q267.8125,159.7188 267.8125,161.8125 Q267.8125,163.9063 268.5,164.9844 Q269.1875,166.0469 270.5313,166.0469 Q271.1563,166.0469 271.75,165.7813 Q272.3438,165.5 272.9688,164.9219 L272.9688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="55" x="284" y="166.1543">Overload</text>
@@ -80,18 +80,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="93" x="348" y="155.1387">TBase,int,A,B,C</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="256" x2="438" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frglqw9de31o4)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="224.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fc6r6iirfwxl5)" height="60.8047" id="C_0000085539867332573320" style="stroke: #A80036; stroke-width: 1.5;" width="245" x="224.5" y="8"/>
       <ellipse cx="338.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M341.7188,29.6406 Q341.1406,29.9375 340.5,30.0781 Q339.8594,30.2344 339.1563,30.2344 Q336.6563,30.2344 335.3281,28.5938 Q334.0156,26.9375 334.0156,23.8125 Q334.0156,20.6875 335.3281,19.0313 Q336.6563,17.375 339.1563,17.375 Q339.8594,17.375 340.5,17.5313 Q341.1563,17.6875 341.7188,17.9844 L341.7188,20.7031 Q341.0938,20.125 340.5,19.8594 Q339.9063,19.5781 339.2813,19.5781 Q337.9375,19.5781 337.25,20.6563 Q336.5625,21.7188 336.5625,23.8125 Q336.5625,25.9063 337.25,26.9844 Q337.9375,28.0469 339.2813,28.0469 Q339.9063,28.0469 340.5,27.7813 Q341.0938,27.5 341.7188,26.9219 L341.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="359.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="230.5" y="46"/>
       <ellipse cx="235.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L32" target="_top" title="overload" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00032/t00032.cc#L32" xlink:show="new" xlink:title="overload" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="219" x="244.5" y="54.2104">overload : Overload&lt;TBase,int,A,B,C&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="225.5" x2="468.5" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md
index 800398db..afce35dc 100644
--- a/docs/test_cases/t00033.md
+++ b/docs/test_cases/t00033.md
@@ -50,3 +50,338 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00033_class](./t00033_class.svg "Nested template instantiation dependency test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00033::A<T>",
+      "id": "2036031998980633871",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "aaa",
+          "source_location": {
+            "file": "../../tests/t00033/t00033.cc",
+            "line": 8
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00033",
+      "source_location": {
+        "file": "../../tests/t00033/t00033.cc",
+        "line": 7
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00033::B<T>",
+      "id": "765515233845859023",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "bbb",
+          "source_location": {
+            "file": "../../tests/t00033/t00033.cc",
+            "line": 12
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00033",
+      "source_location": {
+        "file": "../../tests/t00033/t00033.cc",
+        "line": 11
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00033::C<T>",
+      "id": "1436835384265552869",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "ccc",
+          "source_location": {
+            "file": "../../tests/t00033/t00033.cc",
+            "line": 16
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00033",
+      "source_location": {
+        "file": "../../tests/t00033/t00033.cc",
+        "line": 15
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00033::D",
+      "id": "2199581366769423637",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "ddd",
+          "source_location": {
+            "file": "../../tests/t00033/t00033.cc",
+            "line": 20
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00033",
+      "source_location": {
+        "file": "../../tests/t00033/t00033.cc",
+        "line": 19
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00033::C<clanguml::t00033::D>",
+      "id": "1609446044604054241",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00033",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00033::D"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00033::B<std::unique_ptr<clanguml::t00033::C<clanguml::t00033::D>>>",
+      "id": "384927316081978893",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00033",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "argument",
+                  "template_parameters": [],
+                  "type": "clanguml::t00033::D"
+                }
+              ],
+              "type": "clanguml::t00033::C"
+            }
+          ],
+          "type": "std::unique_ptr"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00033::A<clanguml::t00033::B<std::unique_ptr<clanguml::t00033::C<clanguml::t00033::D>>>>",
+      "id": "1747493965420341251",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00033",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "argument",
+                  "template_parameters": [
+                    {
+                      "is_variadic": false,
+                      "kind": "argument",
+                      "template_parameters": [],
+                      "type": "clanguml::t00033::D"
+                    }
+                  ],
+                  "type": "clanguml::t00033::C"
+                }
+              ],
+              "type": "std::unique_ptr"
+            }
+          ],
+          "type": "clanguml::t00033::B"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00033::R",
+      "id": "1866392706312766470",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "abc",
+          "source_location": {
+            "file": "../../tests/t00033/t00033.cc",
+            "line": 24
+          },
+          "type": "A<B<std::unique_ptr<C<D>>>>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00033",
+      "source_location": {
+        "file": "../../tests/t00033/t00033.cc",
+        "line": 23
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00033_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2199581366769423637",
+      "source": "1609446044604054241",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1436835384265552869",
+      "source": "1609446044604054241",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1609446044604054241",
+      "source": "384927316081978893",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "765515233845859023",
+      "source": "384927316081978893",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "384927316081978893",
+      "source": "1747493965420341251",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2036031998980633871",
+      "source": "1747493965420341251",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1747493965420341251",
+      "label": "abc",
+      "source": "1866392706312766470",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00033"
+}
+```
diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg
index 38853689..09e71d53 100644
--- a/docs/test_cases/t00033_class.svg
+++ b/docs/test_cases/t00033_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="570px" preserveAspectRatio="none" style="width:435px;height:570px;" version="1.1" viewBox="0 0 435 570" width="435px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f123cca8mymj81" width="300%" x="-1" y="-1">
+    <filter height="300%" id="filmqwuk9o1pj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f123cca8mymj81)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#filmqwuk9o1pj)" height="60.8047" id="C_0002036031998980633871" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="76.5" y="255"/>
       <ellipse cx="98.25" cy="271" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M101.2188,276.6406 Q100.6406,276.9375 100,277.0781 Q99.3594,277.2344 98.6563,277.2344 Q96.1563,277.2344 94.8281,275.5938 Q93.5156,273.9375 93.5156,270.8125 Q93.5156,267.6875 94.8281,266.0313 Q96.1563,264.375 98.6563,264.375 Q99.3594,264.375 100,264.5313 Q100.6563,264.6875 101.2188,264.9844 L101.2188,267.7031 Q100.5938,267.125 100,266.8594 Q99.4063,266.5781 98.7813,266.5781 Q97.4375,266.5781 96.75,267.6563 Q96.0625,268.7188 96.0625,270.8125 Q96.0625,272.9063 96.75,273.9844 Q97.4375,275.0469 98.7813,275.0469 Q99.4063,275.0469 100,274.7813 Q100.5938,274.5 101.2188,273.9219 L101.2188,276.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="113.75" y="275.1543">A</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="137.5" y="264.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="287" y2="287"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="82.5" y="293"/>
       <ellipse cx="87.5" cy="298" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L8" target="_top" title="aaa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L8" xlink:show="new" xlink:title="aaa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="96.5" y="301.2104">aaa : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="77.5" x2="141.5" y1="307.8047" y2="307.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f123cca8mymj81)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#filmqwuk9o1pj)" height="60.8047" id="C_0000765515233845859023" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="208.5" y="377"/>
       <ellipse cx="230.25" cy="393" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M233.2188,398.6406 Q232.6406,398.9375 232,399.0781 Q231.3594,399.2344 230.6563,399.2344 Q228.1563,399.2344 226.8281,397.5938 Q225.5156,395.9375 225.5156,392.8125 Q225.5156,389.6875 226.8281,388.0313 Q228.1563,386.375 230.6563,386.375 Q231.3594,386.375 232,386.5313 Q232.6563,386.6875 233.2188,386.9844 L233.2188,389.7031 Q232.5938,389.125 232,388.8594 Q231.4063,388.5781 230.7813,388.5781 Q229.4375,388.5781 228.75,389.6563 Q228.0625,390.7188 228.0625,392.8125 Q228.0625,394.9063 228.75,395.9844 Q229.4375,397.0469 230.7813,397.0469 Q231.4063,397.0469 232,396.7813 Q232.5938,396.5 233.2188,395.9219 L233.2188,398.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="245.75" y="397.1543">B</text>
@@ -35,16 +35,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="269.5" y="386.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="214.5" y="415"/>
       <ellipse cx="219.5" cy="420" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L12" target="_top" title="bbb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L12" xlink:show="new" xlink:title="bbb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="228.5" y="423.2104">bbb : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="209.5" x2="273.5" y1="429.8047" y2="429.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f123cca8mymj81)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#filmqwuk9o1pj)" height="60.8047" id="C_0001436835384265552869" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="253" y="499"/>
       <ellipse cx="273.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M276.3688,520.6406 Q275.7906,520.9375 275.15,521.0781 Q274.5094,521.2344 273.8063,521.2344 Q271.3063,521.2344 269.9781,519.5938 Q268.6656,517.9375 268.6656,514.8125 Q268.6656,511.6875 269.9781,510.0313 Q271.3063,508.375 273.8063,508.375 Q274.5094,508.375 275.15,508.5313 Q275.8063,508.6875 276.3688,508.9844 L276.3688,511.7031 Q275.7438,511.125 275.15,510.8594 Q274.5563,510.5781 273.9313,510.5781 Q272.5875,510.5781 271.9,511.6563 Q271.2125,512.7188 271.2125,514.8125 Q271.2125,516.9063 271.9,517.9844 Q272.5875,519.0469 273.9313,519.0469 Q274.5563,519.0469 275.15,518.7813 Q275.7438,518.5 276.3688,517.9219 L276.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="288.6" y="519.1543">C</text>
@@ -52,30 +52,30 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="311" y="508.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="531" y2="531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="259" y="537"/>
       <ellipse cx="264" cy="542" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L16" target="_top" title="ccc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L16" xlink:show="new" xlink:title="ccc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="273" y="545.2104">ccc : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="254" x2="315" y1="551.8047" y2="551.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f123cca8mymj81)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#filmqwuk9o1pj)" height="60.8047" id="C_0002199581366769423637" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="351" y="499"/>
       <ellipse cx="380.4" cy="515" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.3688,520.6406 Q382.7906,520.9375 382.15,521.0781 Q381.5094,521.2344 380.8063,521.2344 Q378.3063,521.2344 376.9781,519.5938 Q375.6656,517.9375 375.6656,514.8125 Q375.6656,511.6875 376.9781,510.0313 Q378.3063,508.375 380.8063,508.375 Q381.5094,508.375 382.15,508.5313 Q382.8063,508.6875 383.3688,508.9844 L383.3688,511.7031 Q382.7438,511.125 382.15,510.8594 Q381.5563,510.5781 380.9313,510.5781 Q379.5875,510.5781 378.9,511.6563 Q378.2125,512.7188 378.2125,514.8125 Q378.2125,516.9063 378.9,517.9844 Q379.5875,519.0469 380.9313,519.0469 Q381.5563,519.0469 382.15,518.7813 Q382.7438,518.5 383.3688,517.9219 L383.3688,520.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="397.6" y="519.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="531" y2="531"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="357" y="537"/>
       <ellipse cx="362" cy="542" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L20" target="_top" title="ddd" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L20" xlink:show="new" xlink:title="ddd" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="371" y="545.2104">ddd : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="423" y1="551.8047" y2="551.8047"/>
-    <rect fill="#FEFECE" filter="url(#f123cca8mymj81)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
+    <rect fill="#FEFECE" filter="url(#filmqwuk9o1pj)" height="48" id="C_0001609446044604054241" style="stroke: #A80036; stroke-width: 1.5;" width="53" x="310" y="383.5"/>
     <ellipse cx="325" cy="399.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M327.9688,405.1406 Q327.3906,405.4375 326.75,405.5781 Q326.1094,405.7344 325.4063,405.7344 Q322.9063,405.7344 321.5781,404.0938 Q320.2656,402.4375 320.2656,399.3125 Q320.2656,396.1875 321.5781,394.5313 Q322.9063,392.875 325.4063,392.875 Q326.1094,392.875 326.75,393.0313 Q327.4063,393.1875 327.9688,393.4844 L327.9688,396.2031 Q327.3438,395.625 326.75,395.3594 Q326.1563,395.0781 325.5313,395.0781 Q324.1875,395.0781 323.5,396.1563 Q322.8125,397.2188 322.8125,399.3125 Q322.8125,401.4063 323.5,402.4844 Q324.1875,403.5469 325.5313,403.5469 Q326.1563,403.5469 326.75,403.2813 Q327.3438,403 327.9688,402.4219 L327.9688,405.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339" y="403.6543">C</text>
@@ -83,7 +83,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="9" x="356" y="392.6387">D</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="415.5" y2="415.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="311" x2="362" y1="423.5" y2="423.5"/>
-    <rect fill="#FEFECE" filter="url(#f123cca8mymj81)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
+    <rect fill="#FEFECE" filter="url(#filmqwuk9o1pj)" height="48" id="C_0000384927316081978893" style="stroke: #A80036; stroke-width: 1.5;" width="195" x="178" y="261.5"/>
     <ellipse cx="193" cy="277.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M195.9688,283.1406 Q195.3906,283.4375 194.75,283.5781 Q194.1094,283.7344 193.4063,283.7344 Q190.9063,283.7344 189.5781,282.0938 Q188.2656,280.4375 188.2656,277.3125 Q188.2656,274.1875 189.5781,272.5313 Q190.9063,270.875 193.4063,270.875 Q194.1094,270.875 194.75,271.0313 Q195.4063,271.1875 195.9688,271.4844 L195.9688,274.2031 Q195.3438,273.625 194.75,273.3594 Q194.1563,273.0781 193.5313,273.0781 Q192.1875,273.0781 191.5,274.1563 Q190.8125,275.2188 190.8125,277.3125 Q190.8125,279.4063 191.5,280.4844 Q192.1875,281.5469 193.5313,281.5469 Q194.1563,281.5469 194.75,281.2813 Q195.3438,281 195.9688,280.4219 L195.9688,283.1406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="207" y="281.6543">B</text>
@@ -91,7 +91,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="151" x="224" y="270.6387">std::unique_ptr&lt;C&lt;D&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="293.5" y2="293.5"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="179" x2="372" y1="301.5" y2="301.5"/>
-    <rect fill="#FEFECE" filter="url(#f123cca8mymj81)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
+    <rect fill="#FEFECE" filter="url(#filmqwuk9o1pj)" height="48" id="C_0001747493965420341251" style="stroke: #A80036; stroke-width: 1.5;" width="223" x="18" y="146"/>
     <ellipse cx="33" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M35.9688,167.6406 Q35.3906,167.9375 34.75,168.0781 Q34.1094,168.2344 33.4063,168.2344 Q30.9063,168.2344 29.5781,166.5938 Q28.2656,164.9375 28.2656,161.8125 Q28.2656,158.6875 29.5781,157.0313 Q30.9063,155.375 33.4063,155.375 Q34.1094,155.375 34.75,155.5313 Q35.4063,155.6875 35.9688,155.9844 L35.9688,158.7031 Q35.3438,158.125 34.75,157.8594 Q34.1563,157.5781 33.5313,157.5781 Q32.1875,157.5781 31.5,158.6563 Q30.8125,159.7188 30.8125,161.8125 Q30.8125,163.9063 31.5,164.9844 Q32.1875,166.0469 33.5313,166.0469 Q34.1563,166.0469 34.75,165.7813 Q35.3438,165.5 35.9688,164.9219 L35.9688,167.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="47" y="166.1543">A</text>
@@ -99,18 +99,18 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="179" x="64" y="155.1387">B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="178" y2="178"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="19" x2="240" y1="186" y2="186"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f123cca8mymj81)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L23" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L23" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#filmqwuk9o1pj)" height="60.8047" id="C_0001866392706312766470" style="stroke: #A80036; stroke-width: 1.5;" width="247" x="6" y="8"/>
       <ellipse cx="121.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M124.2188,29.6406 Q123.6406,29.9375 123,30.0781 Q122.3594,30.2344 121.6563,30.2344 Q119.1563,30.2344 117.8281,28.5938 Q116.5156,26.9375 116.5156,23.8125 Q116.5156,20.6875 117.8281,19.0313 Q119.1563,17.375 121.6563,17.375 Q122.3594,17.375 123,17.5313 Q123.6563,17.6875 124.2188,17.9844 L124.2188,20.7031 Q123.5938,20.125 123,19.8594 Q122.4063,19.5781 121.7813,19.5781 Q120.4375,19.5781 119.75,20.6563 Q119.0625,21.7188 119.0625,23.8125 Q119.0625,25.9063 119.75,26.9844 Q120.4375,28.0469 121.7813,28.0469 Q122.4063,28.0469 123,27.7813 Q123.5938,27.5 124.2188,26.9219 L124.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="141.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L24" target="_top" title="abc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00033/t00033.cc#L24" xlink:show="new" xlink:title="abc" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="221" x="26" y="54.2104">abc : A&lt;B&lt;std::unique_ptr&lt;C&lt;D&gt;&gt;&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="252" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md
index 5e2acd46..15da7587 100644
--- a/docs/test_cases/t00034.md
+++ b/docs/test_cases/t00034.md
@@ -76,3 +76,258 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00034_class](./t00034_class.svg "Template metaprogramming type function test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00034::Void",
+      "id": "1704456490210873213",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "operator==",
+          "parameters": [
+            {
+              "name": "",
+              "type": "const clanguml::t00034::Void &"
+            }
+          ],
+          "type": "bool"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "operator!=",
+          "parameters": [
+            {
+              "name": "",
+              "type": "const clanguml::t00034::Void &"
+            }
+          ],
+          "type": "bool"
+        }
+      ],
+      "name": "Void",
+      "namespace": "clanguml::t00034",
+      "source_location": {
+        "file": "../../tests/t00034/t00034.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00034::lift_void<T>",
+      "id": "867472442996685316",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "lift_void",
+      "namespace": "clanguml::t00034",
+      "source_location": {
+        "file": "../../tests/t00034/t00034.cc",
+        "line": 16
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00034::lift_void<void>",
+      "id": "126450862226197239",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "lift_void",
+      "namespace": "clanguml::t00034",
+      "source_location": {
+        "file": "../../tests/t00034/t00034.cc",
+        "line": 20
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "void"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00034::drop_void<T>",
+      "id": "1578745816100337706",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "drop_void",
+      "namespace": "clanguml::t00034",
+      "source_location": {
+        "file": "../../tests/t00034/t00034.cc",
+        "line": 33
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00034::drop_void<clanguml::t00034::Void>",
+      "id": "1849836134504075115",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "drop_void",
+      "namespace": "clanguml::t00034",
+      "source_location": {
+        "file": "../../tests/t00034/t00034.cc",
+        "line": 37
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00034::Void"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00034::A",
+      "id": "1383912907884688827",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00034",
+      "source_location": {
+        "file": "../../tests/t00034/t00034.cc",
+        "line": 43
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00034::R",
+      "id": "1713991735741265309",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "la",
+          "source_location": {
+            "file": "../../tests/t00034/t00034.cc",
+            "line": 46
+          },
+          "type": "lift_void_t<clanguml::t00034::A> *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "lv",
+          "source_location": {
+            "file": "../../tests/t00034/t00034.cc",
+            "line": 47
+          },
+          "type": "lift_void_t<void> *"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00034",
+      "source_location": {
+        "file": "../../tests/t00034/t00034.cc",
+        "line": 45
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00034_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "867472442996685316",
+      "source": "126450862226197239",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1578745816100337706",
+      "source": "1849836134504075115",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1383912907884688827",
+      "label": "la",
+      "source": "1713991735741265309",
+      "type": "association"
+    }
+  ],
+  "using_namespace": "clanguml::t00034"
+}
+```
diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg
index 23e59f9b..f02f85e3 100644
--- a/docs/test_cases/t00034_class.svg
+++ b/docs/test_cases/t00034_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="218px" preserveAspectRatio="none" style="width:752px;height:218px;" version="1.1" viewBox="0 0 752 218" width="752px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fpiegsz2785ww" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fsjn6yhwv37vp" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpiegsz2785ww)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L9" target="_top" title="Void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L9" xlink:show="new" xlink:title="Void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsjn6yhwv37vp)" height="73.6094" id="C_0001704456490210873213" style="stroke: #A80036; stroke-width: 1.5;" width="249" x="6" y="8"/>
       <ellipse cx="112.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.7188,29.6406 Q115.1406,29.9375 114.5,30.0781 Q113.8594,30.2344 113.1563,30.2344 Q110.6563,30.2344 109.3281,28.5938 Q108.0156,26.9375 108.0156,23.8125 Q108.0156,20.6875 109.3281,19.0313 Q110.6563,17.375 113.1563,17.375 Q113.8594,17.375 114.5,17.5313 Q115.1563,17.6875 115.7188,17.9844 L115.7188,20.7031 Q115.0938,20.125 114.5,19.8594 Q113.9063,19.5781 113.2813,19.5781 Q111.9375,19.5781 111.25,20.6563 Q110.5625,21.7188 110.5625,23.8125 Q110.5625,25.9063 111.25,26.9844 Q111.9375,28.0469 113.2813,28.0469 Q113.9063,28.0469 114.5,27.7813 Q115.0938,27.5 115.7188,26.9219 L115.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="133.25" y="28.1543">Void</text>
@@ -21,8 +21,8 @@
       <ellipse cx="17" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="217" x="26" y="75.0151">operator!=(const Void &amp; ) const : bool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpiegsz2785ww)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="299" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L16" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L16" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsjn6yhwv37vp)" height="48" id="C_0000867472442996685316" style="stroke: #A80036; stroke-width: 1.5;" width="89" x="299" y="159"/>
       <ellipse cx="314" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M316.9688,180.6406 Q316.3906,180.9375 315.75,181.0781 Q315.1094,181.2344 314.4063,181.2344 Q311.9063,181.2344 310.5781,179.5938 Q309.2656,177.9375 309.2656,174.8125 Q309.2656,171.6875 310.5781,170.0313 Q311.9063,168.375 314.4063,168.375 Q315.1094,168.375 315.75,168.5313 Q316.4063,168.6875 316.9688,168.9844 L316.9688,171.7031 Q316.3438,171.125 315.75,170.8594 Q315.1563,170.5781 314.5313,170.5781 Q313.1875,170.5781 312.5,171.6563 Q311.8125,172.7188 311.8125,174.8125 Q311.8125,176.9063 312.5,177.9844 Q313.1875,179.0469 314.5313,179.0469 Q315.1563,179.0469 315.75,178.7813 Q316.3438,178.5 316.9688,177.9219 L316.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="328" y="179.1543">lift_void</text>
@@ -31,8 +31,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="300" x2="387" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="300" x2="387" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpiegsz2785ww)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="290" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L20" target="_top" title="lift_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L20" xlink:show="new" xlink:title="lift_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsjn6yhwv37vp)" height="48" id="C_0000126450862226197239" style="stroke: #A80036; stroke-width: 1.5;" width="107" x="290" y="21"/>
       <ellipse cx="305" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M307.9688,42.6406 Q307.3906,42.9375 306.75,43.0781 Q306.1094,43.2344 305.4063,43.2344 Q302.9063,43.2344 301.5781,41.5938 Q300.2656,39.9375 300.2656,36.8125 Q300.2656,33.6875 301.5781,32.0313 Q302.9063,30.375 305.4063,30.375 Q306.1094,30.375 306.75,30.5313 Q307.4063,30.6875 307.9688,30.9844 L307.9688,33.7031 Q307.3438,33.125 306.75,32.8594 Q306.1563,32.5781 305.5313,32.5781 Q304.1875,32.5781 303.5,33.6563 Q302.8125,34.7188 302.8125,36.8125 Q302.8125,38.9063 303.5,39.9844 Q304.1875,41.0469 305.5313,41.0469 Q306.1563,41.0469 306.75,40.7813 Q307.3438,40.5 307.9688,39.9219 L307.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="319" y="41.1543">lift_void</text>
@@ -41,8 +41,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="291" x2="396" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="291" x2="396" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpiegsz2785ww)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="442" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L33" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L33" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsjn6yhwv37vp)" height="48" id="C_0001578745816100337706" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="442" y="159"/>
       <ellipse cx="457" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M459.9688,180.6406 Q459.3906,180.9375 458.75,181.0781 Q458.1094,181.2344 457.4063,181.2344 Q454.9063,181.2344 453.5781,179.5938 Q452.2656,177.9375 452.2656,174.8125 Q452.2656,171.6875 453.5781,170.0313 Q454.9063,168.375 457.4063,168.375 Q458.1094,168.375 458.75,168.5313 Q459.4063,168.6875 459.9688,168.9844 L459.9688,171.7031 Q459.3438,171.125 458.75,170.8594 Q458.1563,170.5781 457.5313,170.5781 Q456.1875,170.5781 455.5,171.6563 Q454.8125,172.7188 454.8125,174.8125 Q454.8125,176.9063 455.5,177.9844 Q456.1875,179.0469 457.5313,179.0469 Q458.1563,179.0469 458.75,178.7813 Q459.3438,178.5 459.9688,177.9219 L459.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="471" y="179.1543">drop_void</text>
@@ -51,8 +51,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="443" x2="544" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="443" x2="544" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpiegsz2785ww)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="432" y="21"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L37" target="_top" title="drop_void" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L37" xlink:show="new" xlink:title="drop_void" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsjn6yhwv37vp)" height="48" id="C_0001849836134504075115" style="stroke: #A80036; stroke-width: 1.5;" width="123" x="432" y="21"/>
       <ellipse cx="447" cy="37" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M449.9688,42.6406 Q449.3906,42.9375 448.75,43.0781 Q448.1094,43.2344 447.4063,43.2344 Q444.9063,43.2344 443.5781,41.5938 Q442.2656,39.9375 442.2656,36.8125 Q442.2656,33.6875 443.5781,32.0313 Q444.9063,30.375 447.4063,30.375 Q448.1094,30.375 448.75,30.5313 Q449.4063,30.6875 449.9688,30.9844 L449.9688,33.7031 Q449.3438,33.125 448.75,32.8594 Q448.1563,32.5781 447.5313,32.5781 Q446.1875,32.5781 445.5,33.6563 Q444.8125,34.7188 444.8125,36.8125 Q444.8125,38.9063 445.5,39.9844 Q446.1875,41.0469 447.5313,41.0469 Q448.1563,41.0469 448.75,40.7813 Q449.3438,40.5 449.9688,39.9219 L449.9688,42.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="461" y="41.1543">drop_void</text>
@@ -61,33 +61,33 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="433" x2="554" y1="53" y2="53"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="433" x2="554" y1="61" y2="61"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpiegsz2785ww)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="645.5" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L43" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L43" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsjn6yhwv37vp)" height="48" id="C_0001383912907884688827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="645.5" y="159"/>
       <ellipse cx="660.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M663.4688,180.6406 Q662.8906,180.9375 662.25,181.0781 Q661.6094,181.2344 660.9063,181.2344 Q658.4063,181.2344 657.0781,179.5938 Q655.7656,177.9375 655.7656,174.8125 Q655.7656,171.6875 657.0781,170.0313 Q658.4063,168.375 660.9063,168.375 Q661.6094,168.375 662.25,168.5313 Q662.9063,168.6875 663.4688,168.9844 L663.4688,171.7031 Q662.8438,171.125 662.25,170.8594 Q661.6563,170.5781 661.0313,170.5781 Q659.6875,170.5781 659,171.6563 Q658.3125,172.7188 658.3125,174.8125 Q658.3125,176.9063 659,177.9844 Q659.6875,179.0469 661.0313,179.0469 Q661.6563,179.0469 662.25,178.7813 Q662.8438,178.5 663.4688,177.9219 L663.4688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="674.5" y="179.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="646.5" x2="684.5" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="646.5" x2="684.5" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fpiegsz2785ww)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="590" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L45" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L45" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fsjn6yhwv37vp)" height="73.6094" id="C_0001713991735741265309" style="stroke: #A80036; stroke-width: 1.5;" width="151" x="590" y="8"/>
       <ellipse cx="657.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M660.2188,29.6406 Q659.6406,29.9375 659,30.0781 Q658.3594,30.2344 657.6563,30.2344 Q655.1563,30.2344 653.8281,28.5938 Q652.5156,26.9375 652.5156,23.8125 Q652.5156,20.6875 653.8281,19.0313 Q655.1563,17.375 657.6563,17.375 Q658.3594,17.375 659,17.5313 Q659.6563,17.6875 660.2188,17.9844 L660.2188,20.7031 Q659.5938,20.125 659,19.8594 Q658.4063,19.5781 657.7813,19.5781 Q656.4375,19.5781 655.75,20.6563 Q655.0625,21.7188 655.0625,23.8125 Q655.0625,25.9063 655.75,26.9844 Q656.4375,28.0469 657.7813,28.0469 Q658.4063,28.0469 659,27.7813 Q659.5938,27.5 660.2188,26.9219 L660.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="677.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="591" x2="740" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="596" y="46"/>
       <ellipse cx="601" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L46" target="_top" title="la" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L46" xlink:show="new" xlink:title="la" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="110" x="610" y="54.2104">la : lift_void_t&lt;A&gt; *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="596" y="58.8047"/>
       <ellipse cx="601" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L47" target="_top" title="lv" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00034/t00034.cc#L47" xlink:show="new" xlink:title="lv" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="125" x="610" y="67.0151">lv : lift_void_t&lt;void&gt; *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="591" x2="740" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00035.md b/docs/test_cases/t00035.md
index e8acaa28..b2220472 100644
--- a/docs/test_cases/t00035.md
+++ b/docs/test_cases/t00035.md
@@ -43,3 +43,114 @@ struct Right { };
 ```
 ## Generated UML diagrams
 ![t00035_class](./t00035_class.svg "PlantUML class diagram layout hints test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00035::Top",
+      "id": "2241062883697294772",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Top",
+      "namespace": "clanguml::t00035",
+      "source_location": {
+        "file": "../../tests/t00035/t00035.cc",
+        "line": 4
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00035::Left",
+      "id": "242562856080127946",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Left",
+      "namespace": "clanguml::t00035",
+      "source_location": {
+        "file": "../../tests/t00035/t00035.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00035::Center",
+      "id": "1933304541849408421",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Center",
+      "namespace": "clanguml::t00035",
+      "source_location": {
+        "file": "../../tests/t00035/t00035.cc",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00035::Bottom",
+      "id": "1646691079607377420",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Bottom",
+      "namespace": "clanguml::t00035",
+      "source_location": {
+        "file": "../../tests/t00035/t00035.cc",
+        "line": 10
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00035::Right",
+      "id": "200121820090372322",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "Right",
+      "namespace": "clanguml::t00035",
+      "source_location": {
+        "file": "../../tests/t00035/t00035.cc",
+        "line": 12
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00035_class",
+  "relationships": [],
+  "using_namespace": "clanguml::t00035"
+}
+```
diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg
index 48572509..46fdda44 100644
--- a/docs/test_cases/t00035_class.svg
+++ b/docs/test_cases/t00035_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="283px" preserveAspectRatio="none" style="width:280px;height:283px;" version="1.1" viewBox="0 0 280 283" width="280px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fcd90x3sshcsp" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f7kaqtmzndkwu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd90x3sshcsp)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L4" target="_top" title="Top" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L4" xlink:show="new" xlink:title="Top" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7kaqtmzndkwu)" height="48" id="C_0002241062883697294772" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="106" y="8"/>
       <ellipse cx="121" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M123.9688,29.6406 Q123.3906,29.9375 122.75,30.0781 Q122.1094,30.2344 121.4063,30.2344 Q118.9063,30.2344 117.5781,28.5938 Q116.2656,26.9375 116.2656,23.8125 Q116.2656,20.6875 117.5781,19.0313 Q118.9063,17.375 121.4063,17.375 Q122.1094,17.375 122.75,17.5313 Q123.4063,17.6875 123.9688,17.9844 L123.9688,20.7031 Q123.3438,20.125 122.75,19.8594 Q122.1563,19.5781 121.5313,19.5781 Q120.1875,19.5781 119.5,20.6563 Q118.8125,21.7188 118.8125,23.8125 Q118.8125,25.9063 119.5,26.9844 Q120.1875,28.0469 121.5313,28.0469 Q122.1563,28.0469 122.75,27.7813 Q123.3438,27.5 123.9688,26.9219 L123.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="135" y="28.1543">Top</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="107" x2="160" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd90x3sshcsp)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L6" target="_top" title="Left" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L6" xlink:show="new" xlink:title="Left" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7kaqtmzndkwu)" height="48" id="C_0000242562856080127946" style="stroke: #A80036; stroke-width: 1.5;" width="55" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="23" x="35" y="136.1543">Left</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="60" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd90x3sshcsp)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L8" target="_top" title="Center" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L8" xlink:show="new" xlink:title="Center" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7kaqtmzndkwu)" height="48" id="C_0001933304541849408421" style="stroke: #A80036; stroke-width: 1.5;" width="74" x="96.5" y="116"/>
       <ellipse cx="111.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M114.4688,137.6406 Q113.8906,137.9375 113.25,138.0781 Q112.6094,138.2344 111.9063,138.2344 Q109.4063,138.2344 108.0781,136.5938 Q106.7656,134.9375 106.7656,131.8125 Q106.7656,128.6875 108.0781,127.0313 Q109.4063,125.375 111.9063,125.375 Q112.6094,125.375 113.25,125.5313 Q113.9063,125.6875 114.4688,125.9844 L114.4688,128.7031 Q113.8438,128.125 113.25,127.8594 Q112.6563,127.5781 112.0313,127.5781 Q110.6875,127.5781 110,128.6563 Q109.3125,129.7188 109.3125,131.8125 Q109.3125,133.9063 110,134.9844 Q110.6875,136.0469 112.0313,136.0469 Q112.6563,136.0469 113.25,135.7813 Q113.8438,135.5 114.4688,134.9219 L114.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="42" x="125.5" y="136.1543">Center</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="97.5" x2="169.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd90x3sshcsp)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L10" target="_top" title="Bottom" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L10" xlink:show="new" xlink:title="Bottom" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7kaqtmzndkwu)" height="48" id="C_0001646691079607377420" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="95" y="224"/>
       <ellipse cx="110" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M112.9688,245.6406 Q112.3906,245.9375 111.75,246.0781 Q111.1094,246.2344 110.4063,246.2344 Q107.9063,246.2344 106.5781,244.5938 Q105.2656,242.9375 105.2656,239.8125 Q105.2656,236.6875 106.5781,235.0313 Q107.9063,233.375 110.4063,233.375 Q111.1094,233.375 111.75,233.5313 Q112.4063,233.6875 112.9688,233.9844 L112.9688,236.7031 Q112.3438,236.125 111.75,235.8594 Q111.1563,235.5781 110.5313,235.5781 Q109.1875,235.5781 108.5,236.6563 Q107.8125,237.7188 107.8125,239.8125 Q107.8125,241.9063 108.5,242.9844 Q109.1875,244.0469 110.5313,244.0469 Q111.1563,244.0469 111.75,243.7813 Q112.3438,243.5 112.9688,242.9219 L112.9688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="124" y="244.1543">Bottom</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="256" y2="256"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="96" x2="171" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fcd90x3sshcsp)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L12" target="_top" title="Right" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00035/t00035.cc#L12" xlink:show="new" xlink:title="Right" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f7kaqtmzndkwu)" height="48" id="C_0000200121820090372322" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="205.5" y="116"/>
       <ellipse cx="220.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.4688,137.6406 Q222.8906,137.9375 222.25,138.0781 Q221.6094,138.2344 220.9063,138.2344 Q218.4063,138.2344 217.0781,136.5938 Q215.7656,134.9375 215.7656,131.8125 Q215.7656,128.6875 217.0781,127.0313 Q218.4063,125.375 220.9063,125.375 Q221.6094,125.375 222.25,125.5313 Q222.9063,125.6875 223.4688,125.9844 L223.4688,128.7031 Q222.8438,128.125 222.25,127.8594 Q221.6563,127.5781 221.0313,127.5781 Q219.6875,127.5781 219,128.6563 Q218.3125,129.7188 218.3125,131.8125 Q218.3125,133.9063 219,134.9844 Q219.6875,136.0469 221.0313,136.0469 Q221.6563,136.0469 222.25,135.7813 Q222.8438,135.5 223.4688,134.9219 L223.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="234.5" y="136.1543">Right</text>
diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md
index 82661f6c..cda15954 100644
--- a/docs/test_cases/t00036.md
+++ b/docs/test_cases/t00036.md
@@ -56,3 +56,191 @@ struct C { };
 ```
 ## Generated UML diagrams
 ![t00036_class](./t00036_class.svg "Class diagram with namespaces generated as packages")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "display_name": "clanguml::t00036::ns1",
+      "elements": [
+        {
+          "constants": [
+            "blue",
+            "yellow"
+          ],
+          "display_name": "clanguml::t00036::ns1::E",
+          "id": "2144761953049158478",
+          "is_nested": false,
+          "name": "E",
+          "namespace": "clanguml::t00036::ns1",
+          "source_location": {
+            "file": "../../tests/t00036/t00036.cc",
+            "line": 6
+          },
+          "type": "enum"
+        },
+        {
+          "display_name": "clanguml::t00036::ns1::ns11",
+          "elements": [
+            {
+              "bases": [],
+              "display_name": "clanguml::t00036::ns1::ns11::A<T>",
+              "id": "571573305652194946",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": true,
+              "is_template": true,
+              "is_union": false,
+              "members": [
+                {
+                  "access": "public",
+                  "is_static": false,
+                  "name": "a",
+                  "source_location": {
+                    "file": "../../tests/t00036/t00036.cc",
+                    "line": 11
+                  },
+                  "type": "T"
+                }
+              ],
+              "methods": [],
+              "name": "A",
+              "namespace": "clanguml::t00036::ns1::ns11",
+              "source_location": {
+                "file": "../../tests/t00036/t00036.cc",
+                "line": 10
+              },
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "template_type",
+                  "name": "T",
+                  "template_parameters": []
+                }
+              ],
+              "type": "class"
+            },
+            {
+              "display_name": "clanguml::t00036::ns1::ns11::ns111",
+              "elements": [
+                {
+                  "bases": [],
+                  "display_name": "clanguml::t00036::ns1::ns11::ns111::B",
+                  "id": "1964031933563607376",
+                  "is_abstract": false,
+                  "is_nested": false,
+                  "is_struct": true,
+                  "is_template": false,
+                  "is_union": false,
+                  "members": [
+                    {
+                      "access": "public",
+                      "is_static": false,
+                      "name": "a_int",
+                      "source_location": {
+                        "file": "../../tests/t00036/t00036.cc",
+                        "line": 17
+                      },
+                      "type": "A<int>"
+                    }
+                  ],
+                  "methods": [],
+                  "name": "B",
+                  "namespace": "clanguml::t00036::ns1::ns11::ns111",
+                  "source_location": {
+                    "file": "../../tests/t00036/t00036.cc",
+                    "line": 16
+                  },
+                  "template_parameters": [],
+                  "type": "class"
+                }
+              ],
+              "name": "ns111",
+              "type": "namespace"
+            },
+            {
+              "bases": [],
+              "display_name": "clanguml::t00036::ns1::ns11::A<int>",
+              "id": "1832710427462319797",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "A",
+              "namespace": "clanguml::t00036::ns1::ns11",
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "argument",
+                  "template_parameters": [],
+                  "type": "int"
+                }
+              ],
+              "type": "class"
+            }
+          ],
+          "name": "ns11",
+          "type": "namespace"
+        }
+      ],
+      "name": "ns1",
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t00036::ns2",
+      "elements": [
+        {
+          "display_name": "clanguml::t00036::ns2::ns22",
+          "elements": [
+            {
+              "bases": [],
+              "display_name": "clanguml::t00036::ns2::ns22::C",
+              "id": "2038956882066165590",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": true,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "C",
+              "namespace": "clanguml::t00036::ns2::ns22",
+              "source_location": {
+                "file": "../../tests/t00036/t00036.cc",
+                "line": 28
+              },
+              "template_parameters": [],
+              "type": "class"
+            }
+          ],
+          "name": "ns22",
+          "type": "namespace"
+        }
+      ],
+      "name": "ns2",
+      "type": "namespace"
+    }
+  ],
+  "name": "t00036_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1832710427462319797",
+      "label": "a_int",
+      "source": "1964031933563607376",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "571573305652194946",
+      "source": "1832710427462319797",
+      "type": "instantiation"
+    }
+  ],
+  "using_namespace": "clanguml::t00036"
+}
+```
diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg
index 9764d5ee..4f66b033 100644
--- a/docs/test_cases/t00036_class.svg
+++ b/docs/test_cases/t00036_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="525px" preserveAspectRatio="none" style="width:476px;height:525px;" version="1.1" viewBox="0 0 476 525" width="476px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1cgfdplmiv5j9" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1fa8z6l5jnpyd" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1cgfdplmiv5j9)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fa8z6l5jnpyd)" points="22,24.5,57,24.5,64,46.7969,310,46.7969,310,513,22,513,22,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="46.7969" y2="46.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f1cgfdplmiv5j9)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fa8z6l5jnpyd)" points="102,67.5,147,67.5,154,89.7969,286,89.7969,286,489,102,489,102,67.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="102" x2="154" y1="89.7969" y2="89.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="106" y="82.4951">ns11</text>
-    <polygon fill="#FFFFFF" filter="url(#f1cgfdplmiv5j9)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fa8z6l5jnpyd)" points="126,110.5,181,110.5,188,132.7969,262,132.7969,262,222.5,126,222.5,126,110.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="126" x2="188" y1="132.7969" y2="132.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="49" x="130" y="125.4951">ns111</text>
-    <polygon fill="#FFFFFF" filter="url(#f1cgfdplmiv5j9)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fa8z6l5jnpyd)" points="334,74,369,74,376,96.2969,454,96.2969,454,240,334,240,334,74" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="334" x2="376" y1="96.2969" y2="96.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="338" y="88.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1cgfdplmiv5j9)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1fa8z6l5jnpyd)" points="358,117,403,117,410,139.2969,430,139.2969,430,216,358,216,358,117" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="358" x2="410" y1="139.2969" y2="139.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="39" x="362" y="131.9951">ns22</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cgfdplmiv5j9)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L6" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L6" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fa8z6l5jnpyd)" height="73.6094" id="C_0002144761953049158478" style="stroke: #A80036; stroke-width: 1.5;" width="47" x="38.5" y="139"/>
       <ellipse cx="56.65" cy="155" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.7594,161 L53.0406,161 L53.0406,148.6094 L60.7594,148.6094 L60.7594,150.7656 L55.4938,150.7656 L55.4938,153.4375 L60.2594,153.4375 L60.2594,155.5938 L55.4938,155.5938 L55.4938,158.8438 L60.7594,158.8438 L60.7594,161 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="71.35" y="159.1543">E</text>
@@ -34,8 +34,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="35" x="44.5" y="198.0151">yellow</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="39.5" x2="84.5" y1="204.6094" y2="204.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cgfdplmiv5j9)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fa8z6l5jnpyd)" height="60.8047" id="C_0000571573305652194946" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="168" y="412"/>
       <ellipse cx="183.45" cy="428" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.4188,433.6406 Q185.8406,433.9375 185.2,434.0781 Q184.5594,434.2344 183.8563,434.2344 Q181.3563,434.2344 180.0281,432.5938 Q178.7156,430.9375 178.7156,427.8125 Q178.7156,424.6875 180.0281,423.0313 Q181.3563,421.375 183.8563,421.375 Q184.5594,421.375 185.2,421.5313 Q185.8563,421.6875 186.4188,421.9844 L186.4188,424.7031 Q185.7938,424.125 185.2,423.8594 Q184.6063,423.5781 183.9813,423.5781 Q182.6375,423.5781 181.95,424.6563 Q181.2625,425.7188 181.2625,427.8125 Q181.2625,429.9063 181.95,430.9844 Q182.6375,432.0469 183.9813,432.0469 Q184.6063,432.0469 185.2,431.7813 Q185.7938,431.5 186.4188,430.9219 L186.4188,433.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="197.55" y="432.1543">A</text>
@@ -43,15 +43,15 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="215" y="421.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="444" y2="444"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="174" y="450"/>
       <ellipse cx="179" cy="455" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L11" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L11" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="188" y="458.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="169" x2="219" y1="464.8047" y2="464.8047"/>
-    <rect fill="#FEFECE" filter="url(#f1cgfdplmiv5j9)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
+    <rect fill="#FEFECE" filter="url(#f1fa8z6l5jnpyd)" height="48" id="C_0001832710427462319797" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="164" y="303"/>
     <ellipse cx="179" cy="319" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M181.9688,324.6406 Q181.3906,324.9375 180.75,325.0781 Q180.1094,325.2344 179.4063,325.2344 Q176.9063,325.2344 175.5781,323.5938 Q174.2656,321.9375 174.2656,318.8125 Q174.2656,315.6875 175.5781,314.0313 Q176.9063,312.375 179.4063,312.375 Q180.1094,312.375 180.75,312.5313 Q181.4063,312.6875 181.9688,312.9844 L181.9688,315.7031 Q181.3438,315.125 180.75,314.8594 Q180.1563,314.5781 179.5313,314.5781 Q178.1875,314.5781 177.5,315.6563 Q176.8125,316.7188 176.8125,318.8125 Q176.8125,320.9063 177.5,321.9844 Q178.1875,323.0469 179.5313,323.0469 Q180.1563,323.0469 180.75,322.7813 Q181.3438,322.5 181.9688,321.9219 L181.9688,324.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="193" y="323.1543">A</text>
@@ -59,23 +59,23 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="210" y="312.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="335" y2="335"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="165" x2="223" y1="343" y2="343"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cgfdplmiv5j9)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fa8z6l5jnpyd)" height="60.8047" id="C_0001964031933563607376" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="142" y="145.5"/>
       <ellipse cx="185.8" cy="161.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M188.7688,167.1406 Q188.1906,167.4375 187.55,167.5781 Q186.9094,167.7344 186.2063,167.7344 Q183.7063,167.7344 182.3781,166.0938 Q181.0656,164.4375 181.0656,161.3125 Q181.0656,158.1875 182.3781,156.5313 Q183.7063,154.875 186.2063,154.875 Q186.9094,154.875 187.55,155.0313 Q188.2063,155.1875 188.7688,155.4844 L188.7688,158.2031 Q188.1438,157.625 187.55,157.3594 Q186.9563,157.0781 186.3313,157.0781 Q184.9875,157.0781 184.3,158.1563 Q183.6125,159.2188 183.6125,161.3125 Q183.6125,163.4063 184.3,164.4844 Q184.9875,165.5469 186.3313,165.5469 Q186.9563,165.5469 187.55,165.2813 Q188.1438,165 188.7688,164.4219 L188.7688,167.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="206.2" y="165.6543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="177.5" y2="177.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="148" y="183.5"/>
       <ellipse cx="153" cy="188.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L17" target="_top" title="a_int" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L17" xlink:show="new" xlink:title="a_int" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="78" x="162" y="191.7104">a_int : A&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="143" x2="245" y1="198.3047" y2="198.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1cgfdplmiv5j9)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L28" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00036/t00036.cc#L28" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1fa8z6l5jnpyd)" height="48" id="C_0002038956882066165590" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="374" y="152"/>
       <ellipse cx="389" cy="168" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M391.9688,173.6406 Q391.3906,173.9375 390.75,174.0781 Q390.1094,174.2344 389.4063,174.2344 Q386.9063,174.2344 385.5781,172.5938 Q384.2656,170.9375 384.2656,167.8125 Q384.2656,164.6875 385.5781,163.0313 Q386.9063,161.375 389.4063,161.375 Q390.1094,161.375 390.75,161.5313 Q391.4063,161.6875 391.9688,161.9844 L391.9688,164.7031 Q391.3438,164.125 390.75,163.8594 Q390.1563,163.5781 389.5313,163.5781 Q388.1875,163.5781 387.5,164.6563 Q386.8125,165.7188 386.8125,167.8125 Q386.8125,169.9063 387.5,170.9844 Q388.1875,172.0469 389.5313,172.0469 Q390.1563,172.0469 390.75,171.7813 Q391.3438,171.5 391.9688,170.9219 L391.9688,173.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="403" y="172.1543">C</text>
diff --git a/docs/test_cases/t00037.md b/docs/test_cases/t00037.md
index 0f251d01..013df5a3 100644
--- a/docs/test_cases/t00037.md
+++ b/docs/test_cases/t00037.md
@@ -55,3 +55,223 @@ struct A {
 ```
 ## Generated UML diagrams
 ![t00037_class](./t00037_class.svg "Anonymous nested struct test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00037::ST",
+      "id": "11203041379038775",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "dimensions",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 11
+          },
+          "type": "ST##(anonymous_662)"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "units",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 17
+          },
+          "type": "ST##(anonymous_792)"
+        }
+      ],
+      "methods": [],
+      "name": "ST",
+      "namespace": "clanguml::t00037",
+      "source_location": {
+        "file": "../../tests/t00037/t00037.cc",
+        "line": 4
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00037::ST::(dimensions)",
+      "id": "1980820317972901050",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "t",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 7
+          },
+          "type": "double"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "x",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 8
+          },
+          "type": "double"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "y",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 9
+          },
+          "type": "double"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "z",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 10
+          },
+          "type": "double"
+        }
+      ],
+      "methods": [],
+      "name": "ST::(dimensions)",
+      "namespace": "clanguml::t00037",
+      "source_location": {
+        "file": "../../tests/t00037/t00037.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00037::ST::(units)",
+      "id": "1811145508890403377",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 15
+          },
+          "type": "double"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "h",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 16
+          },
+          "type": "double"
+        }
+      ],
+      "methods": [],
+      "name": "ST::(units)",
+      "namespace": "clanguml::t00037",
+      "source_location": {
+        "file": "../../tests/t00037/t00037.cc",
+        "line": 14
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00037::A",
+      "id": "1322794181774144954",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "st",
+          "source_location": {
+            "file": "../../tests/t00037/t00037.cc",
+            "line": 29
+          },
+          "type": "clanguml::t00037::ST"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "A",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00037",
+      "source_location": {
+        "file": "../../tests/t00037/t00037.cc",
+        "line": 20
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00037_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1980820317972901050",
+      "label": "dimensions",
+      "source": "11203041379038775",
+      "type": "aggregation"
+    },
+    {
+      "access": "private",
+      "destination": "1811145508890403377",
+      "label": "units",
+      "source": "11203041379038775",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "11203041379038775",
+      "label": "st",
+      "source": "1322794181774144954",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00037"
+}
+```
diff --git a/docs/test_cases/t00037_class.svg b/docs/test_cases/t00037_class.svg
index 98c6f40c..0ae3edcf 100644
--- a/docs/test_cases/t00037_class.svg
+++ b/docs/test_cases/t00037_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="420px" preserveAspectRatio="none" style="width:284px;height:420px;" version="1.1" viewBox="0 0 284 420" width="284px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1s5iebqjmbzb3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f198vqs6jkpx84" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,98 +9,98 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1s5iebqjmbzb3)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L4" target="_top" title="ST" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L4" xlink:show="new" xlink:title="ST" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f198vqs6jkpx84)" height="73.6094" id="C_0000011203041379038775" style="stroke: #A80036; stroke-width: 1.5;" width="228" x="35" y="159"/>
       <ellipse cx="137.25" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M140.2188,180.6406 Q139.6406,180.9375 139,181.0781 Q138.3594,181.2344 137.6563,181.2344 Q135.1563,181.2344 133.8281,179.5938 Q132.5156,177.9375 132.5156,174.8125 Q132.5156,171.6875 133.8281,170.0313 Q135.1563,168.375 137.6563,168.375 Q138.3594,168.375 139,168.5313 Q139.6563,168.6875 140.2188,168.9844 L140.2188,171.7031 Q139.5938,171.125 139,170.8594 Q138.4063,170.5781 137.7813,170.5781 Q136.4375,170.5781 135.75,171.6563 Q135.0625,172.7188 135.0625,174.8125 Q135.0625,176.9063 135.75,177.9844 Q136.4375,179.0469 137.7813,179.0469 Q138.4063,179.0469 139,178.7813 Q139.5938,178.5 140.2188,177.9219 L140.2188,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="15" x="157.75" y="179.1543">ST</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="36" x2="262" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="205"/>
       <ellipse cx="46" cy="210" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L11" target="_top" title="dimensions" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L11" xlink:show="new" xlink:title="dimensions" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="202" x="55" y="213.2104">dimensions : ST::(anonymous_662)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="41" y="217.8047"/>
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="43" y="219.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L17" target="_top" title="units" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L17" xlink:show="new" xlink:title="units" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="164" x="55" y="226.0151">units : ST::(anonymous_792)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1s5iebqjmbzb3)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L6" target="_top" title="ST##(dimensions)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L6" xlink:show="new" xlink:title="ST##(dimensions)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f198vqs6jkpx84)" height="99.2188" id="C_0001980820317972901050" style="stroke: #A80036; stroke-width: 1.5;" width="136" x="6" y="310"/>
       <ellipse cx="21" cy="326" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,331.6406 Q23.3906,331.9375 22.75,332.0781 Q22.1094,332.2344 21.4063,332.2344 Q18.9063,332.2344 17.5781,330.5938 Q16.2656,328.9375 16.2656,325.8125 Q16.2656,322.6875 17.5781,321.0313 Q18.9063,319.375 21.4063,319.375 Q22.1094,319.375 22.75,319.5313 Q23.4063,319.6875 23.9688,319.9844 L23.9688,322.7031 Q23.3438,322.125 22.75,321.8594 Q22.1563,321.5781 21.5313,321.5781 Q20.1875,321.5781 19.5,322.6563 Q18.8125,323.7188 18.8125,325.8125 Q18.8125,327.9063 19.5,328.9844 Q20.1875,330.0469 21.5313,330.0469 Q22.1563,330.0469 22.75,329.7813 Q23.3438,329.5 23.9688,328.9219 L23.9688,331.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="104" x="35" y="330.1543">ST::(dimensions)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="342" y2="342"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="348"/>
       <ellipse cx="17" cy="353" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L7" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L7" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="26" y="356.2104">t : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="360.8047"/>
       <ellipse cx="17" cy="365.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L8" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L8" xlink:show="new" xlink:title="x" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="369.0151">x : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="373.6094"/>
       <ellipse cx="17" cy="378.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L9" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L9" xlink:show="new" xlink:title="y" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="26" y="381.8198">y : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="386.4141"/>
       <ellipse cx="17" cy="391.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L10" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L10" xlink:show="new" xlink:title="z" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="55" x="26" y="394.6245">z : double</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="141" y1="401.2188" y2="401.2188"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1s5iebqjmbzb3)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L14" target="_top" title="ST##(units)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L14" xlink:show="new" xlink:title="ST##(units)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f198vqs6jkpx84)" height="73.6094" id="C_0001811145508890403377" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="177" y="322.5"/>
       <ellipse cx="192" cy="338.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M194.9688,344.1406 Q194.3906,344.4375 193.75,344.5781 Q193.1094,344.7344 192.4063,344.7344 Q189.9063,344.7344 188.5781,343.0938 Q187.2656,341.4375 187.2656,338.3125 Q187.2656,335.1875 188.5781,333.5313 Q189.9063,331.875 192.4063,331.875 Q193.1094,331.875 193.75,332.0313 Q194.4063,332.1875 194.9688,332.4844 L194.9688,335.2031 Q194.3438,334.625 193.75,334.3594 Q193.1563,334.0781 192.5313,334.0781 Q191.1875,334.0781 190.5,335.1563 Q189.8125,336.2188 189.8125,338.3125 Q189.8125,340.4063 190.5,341.4844 Q191.1875,342.5469 192.5313,342.5469 Q193.1563,342.5469 193.75,342.2813 Q194.3438,342 194.9688,341.4219 L194.9688,344.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="206" y="342.6543">ST::(units)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="354.5" y2="354.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="360.5"/>
       <ellipse cx="188" cy="365.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L15" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L15" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="56" x="197" y="368.7104">c : double</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="183" y="373.3047"/>
       <ellipse cx="188" cy="378.3047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L16" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L16" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="57" x="197" y="381.5151">h : double</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="178" x2="272" y1="388.1094" y2="388.1094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1s5iebqjmbzb3)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f198vqs6jkpx84)" height="73.6094" id="C_0001322794181774144954" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="111" y="8"/>
       <ellipse cx="142.2" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.1688,29.6406 Q144.5906,29.9375 143.95,30.0781 Q143.3094,30.2344 142.6063,30.2344 Q140.1063,30.2344 138.7781,28.5938 Q137.4656,26.9375 137.4656,23.8125 Q137.4656,20.6875 138.7781,19.0313 Q140.1063,17.375 142.6063,17.375 Q143.3094,17.375 143.95,17.5313 Q144.6063,17.6875 145.1688,17.9844 L145.1688,20.7031 Q144.5438,20.125 143.95,19.8594 Q143.3563,19.5781 142.7313,19.5781 Q141.3875,19.5781 140.7,20.6563 Q140.0125,21.7188 140.0125,23.8125 Q140.0125,25.9063 140.7,26.9844 Q141.3875,28.0469 142.7313,28.0469 Q143.3563,28.0469 143.95,27.7813 Q144.5438,27.5 145.1688,26.9219 L145.1688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="159.8" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="117" y="46"/>
       <ellipse cx="122" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L29" target="_top" title="st" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00037/t00037.cc#L29" xlink:show="new" xlink:title="st" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="131" y="54.2104">st : ST</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="112" x2="186" y1="60.8047" y2="60.8047"/>
diff --git a/docs/test_cases/t00038.md b/docs/test_cases/t00038.md
index 850e0e30..9024497c 100644
--- a/docs/test_cases/t00038.md
+++ b/docs/test_cases/t00038.md
@@ -74,3 +74,480 @@ struct map<std::map<key_t,
 ```
 ## Generated UML diagrams
 ![t00038_class](./t00038_class.svg "Template instantiation with unexposed nested templates")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "constants": [
+        "red",
+        "green",
+        "blue"
+      ],
+      "display_name": "thirdparty::ns1::color_t",
+      "id": "566782399856868761",
+      "is_nested": false,
+      "name": "color_t",
+      "namespace": "thirdparty::ns1",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 8
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "thirdparty::ns1::E",
+      "id": "1642222718760881014",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "thirdparty::ns1",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 10
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "property_a",
+        "property_b",
+        "property_c"
+      ],
+      "display_name": "clanguml::t00038::property_t",
+      "id": "7376951310260829",
+      "is_nested": false,
+      "name": "property_t",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 20
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00038::A",
+      "id": "790040432414172612",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00038::B",
+      "id": "1295970068907562690",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 23
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00038::C",
+      "id": "154510361779680983",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 24
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00038::key_t",
+      "id": "137163683637529037",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "key",
+          "source_location": {
+            "file": "../../tests/t00038/t00038.cc",
+            "line": 27
+          },
+          "type": "std::string"
+        }
+      ],
+      "methods": [],
+      "name": "key_t",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 26
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00038::map<T>",
+      "id": "1917560728132448300",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "map",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 30
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1642222718760881014",
+          "is_virtual": false,
+          "name": "thirdparty::ns1::E"
+        }
+      ],
+      "display_name": "clanguml::t00038::map<std::integral_constant<thirdparty::ns1::color_t,thirdparty::ns1::color_t::red>>",
+      "id": "1664022047310891203",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "map",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 34
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "thirdparty::ns1::color_t"
+            },
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "thirdparty::ns1::color_t::red"
+            }
+          ],
+          "type": "std::integral_constant"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "790040432414172612",
+          "is_virtual": false,
+          "name": "clanguml::t00038::A"
+        }
+      ],
+      "display_name": "clanguml::t00038::map<std::integral_constant<clanguml::t00038::property_t,clanguml::t00038::property_t::property_a>>",
+      "id": "307700801045535833",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "map",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 37
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "clanguml::t00038::property_t"
+            },
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "clanguml::t00038::property_t::property_a"
+            }
+          ],
+          "type": "std::integral_constant"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1295970068907562690",
+          "is_virtual": false,
+          "name": "clanguml::t00038::B"
+        }
+      ],
+      "display_name": "clanguml::t00038::map<std::vector<std::integral_constant<clanguml::t00038::property_t,clanguml::t00038::property_t::property_b>>>",
+      "id": "548231528417484191",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "map",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 41
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "argument",
+                  "template_parameters": [],
+                  "type": "clanguml::t00038::property_t"
+                },
+                {
+                  "is_variadic": false,
+                  "kind": "argument",
+                  "template_parameters": [],
+                  "type": "clanguml::t00038::property_t::property_b"
+                }
+              ],
+              "type": "std::integral_constant"
+            }
+          ],
+          "type": "std::vector"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "154510361779680983",
+          "is_virtual": false,
+          "name": "clanguml::t00038::C"
+        }
+      ],
+      "display_name": "clanguml::t00038::map<std::map<clanguml::t00038::key_t,std::vector<std::integral_constant<clanguml::t00038::property_t,clanguml::t00038::property_t::property_c>>>>",
+      "id": "1510200402118706005",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "map",
+      "namespace": "clanguml::t00038",
+      "source_location": {
+        "file": "../../tests/t00038/t00038.cc",
+        "line": 46
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "clanguml::t00038::key_t"
+            },
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [
+                {
+                  "is_variadic": false,
+                  "kind": "argument",
+                  "template_parameters": [
+                    {
+                      "is_variadic": false,
+                      "kind": "argument",
+                      "template_parameters": [],
+                      "type": "clanguml::t00038::property_t"
+                    },
+                    {
+                      "is_variadic": false,
+                      "kind": "argument",
+                      "template_parameters": [],
+                      "type": "clanguml::t00038::property_t::property_c"
+                    }
+                  ],
+                  "type": "std::integral_constant"
+                }
+              ],
+              "type": "std::vector"
+            }
+          ],
+          "type": "std::map"
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00038_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "566782399856868761",
+      "source": "1664022047310891203",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1917560728132448300",
+      "source": "1664022047310891203",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1642222718760881014",
+      "source": "1664022047310891203",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "7376951310260829",
+      "source": "307700801045535833",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1917560728132448300",
+      "source": "307700801045535833",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "790040432414172612",
+      "source": "307700801045535833",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "7376951310260829",
+      "source": "548231528417484191",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1917560728132448300",
+      "source": "548231528417484191",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1295970068907562690",
+      "source": "548231528417484191",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "137163683637529037",
+      "source": "1510200402118706005",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "7376951310260829",
+      "source": "1510200402118706005",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1917560728132448300",
+      "source": "1510200402118706005",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "154510361779680983",
+      "source": "1510200402118706005",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00038"
+}
+```
diff --git a/docs/test_cases/t00038_class.svg b/docs/test_cases/t00038_class.svg
index 5a3ec793..e30d120a 100644
--- a/docs/test_cases/t00038_class.svg
+++ b/docs/test_cases/t00038_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="321px" preserveAspectRatio="none" style="width:2230px;height:321px;" version="1.1" viewBox="0 0 2230 321" width="2230px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1qcqdp6my8s0i" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1taodrorzd4bf" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L8" target="_top" title="color_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L8" xlink:show="new" xlink:title="color_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="86.4141" id="C_0000566782399856868761" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="187" y="224"/>
       <ellipse cx="202" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M206.1094,246 L198.3906,246 L198.3906,233.6094 L206.1094,233.6094 L206.1094,235.7656 L200.8438,235.7656 L200.8438,238.4375 L205.6094,238.4375 L205.6094,240.5938 L200.8438,240.5938 L200.8438,243.8438 L206.1094,243.8438 L206.1094,246 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="142" x="216" y="244.1543">thirdparty::ns1::color_t</text>
@@ -20,16 +20,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="24" x="193" y="295.8198">blue</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="188" x2="360" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="204" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0001642222718760881014" style="stroke: #A80036; stroke-width: 1.5;" width="140" x="204" y="8"/>
       <ellipse cx="219" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M221.9688,29.6406 Q221.3906,29.9375 220.75,30.0781 Q220.1094,30.2344 219.4063,30.2344 Q216.9063,30.2344 215.5781,28.5938 Q214.2656,26.9375 214.2656,23.8125 Q214.2656,20.6875 215.5781,19.0313 Q216.9063,17.375 219.4063,17.375 Q220.1094,17.375 220.75,17.5313 Q221.4063,17.6875 221.9688,17.9844 L221.9688,20.7031 Q221.3438,20.125 220.75,19.8594 Q220.1563,19.5781 219.5313,19.5781 Q218.1875,19.5781 217.5,20.6563 Q216.8125,21.7188 216.8125,23.8125 Q216.8125,25.9063 217.5,26.9844 Q218.1875,28.0469 219.5313,28.0469 Q220.1563,28.0469 220.75,27.7813 Q221.3438,27.5 221.9688,26.9219 L221.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="108" x="233" y="28.1543">thirdparty::ns1::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="205" x2="343" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L20" target="_top" title="property_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L20" xlink:show="new" xlink:title="property_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="86.4141" id="C_0000007376951310260829" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="1251" y="224"/>
       <ellipse cx="1266" cy="240" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1270.1094,246 L1262.3906,246 L1262.3906,233.6094 L1270.1094,233.6094 L1270.1094,235.7656 L1264.8438,235.7656 L1264.8438,238.4375 L1269.6094,238.4375 L1269.6094,240.5938 L1264.8438,240.5938 L1264.8438,243.8438 L1270.1094,243.8438 L1270.1094,246 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="64" x="1280" y="244.1543">property_t</text>
@@ -39,47 +39,47 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="60" x="1257" y="295.8198">property_c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1252" x2="1346" y1="302.4141" y2="302.4141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0000790040432414172612" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="772" y="8"/>
       <ellipse cx="787" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M789.9688,29.6406 Q789.3906,29.9375 788.75,30.0781 Q788.1094,30.2344 787.4063,30.2344 Q784.9063,30.2344 783.5781,28.5938 Q782.2656,26.9375 782.2656,23.8125 Q782.2656,20.6875 783.5781,19.0313 Q784.9063,17.375 787.4063,17.375 Q788.1094,17.375 788.75,17.5313 Q789.4063,17.6875 789.9688,17.9844 L789.9688,20.7031 Q789.3438,20.125 788.75,19.8594 Q788.1563,19.5781 787.5313,19.5781 Q786.1875,19.5781 785.5,20.6563 Q784.8125,21.7188 784.8125,23.8125 Q784.8125,25.9063 785.5,26.9844 Q786.1875,28.0469 787.5313,28.0469 Q788.1563,28.0469 788.75,27.7813 Q789.3438,27.5 789.9688,26.9219 L789.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="801" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="773" x2="811" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L23" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L23" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0001295970068907562690" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1279" y="8"/>
       <ellipse cx="1294" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1296.9688,29.6406 Q1296.3906,29.9375 1295.75,30.0781 Q1295.1094,30.2344 1294.4063,30.2344 Q1291.9063,30.2344 1290.5781,28.5938 Q1289.2656,26.9375 1289.2656,23.8125 Q1289.2656,20.6875 1290.5781,19.0313 Q1291.9063,17.375 1294.4063,17.375 Q1295.1094,17.375 1295.75,17.5313 Q1296.4063,17.6875 1296.9688,17.9844 L1296.9688,20.7031 Q1296.3438,20.125 1295.75,19.8594 Q1295.1563,19.5781 1294.5313,19.5781 Q1293.1875,19.5781 1292.5,20.6563 Q1291.8125,21.7188 1291.8125,23.8125 Q1291.8125,25.9063 1292.5,26.9844 Q1293.1875,28.0469 1294.5313,28.0469 Q1295.1563,28.0469 1295.75,27.7813 Q1296.3438,27.5 1296.9688,26.9219 L1296.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1308" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1280" x2="1318" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L24" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L24" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0000154510361779680983" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1884" y="8"/>
       <ellipse cx="1899" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1901.9688,29.6406 Q1901.3906,29.9375 1900.75,30.0781 Q1900.1094,30.2344 1899.4063,30.2344 Q1896.9063,30.2344 1895.5781,28.5938 Q1894.2656,26.9375 1894.2656,23.8125 Q1894.2656,20.6875 1895.5781,19.0313 Q1896.9063,17.375 1899.4063,17.375 Q1900.1094,17.375 1900.75,17.5313 Q1901.4063,17.6875 1901.9688,17.9844 L1901.9688,20.7031 Q1901.3438,20.125 1900.75,19.8594 Q1900.1563,19.5781 1899.5313,19.5781 Q1898.1875,19.5781 1897.5,20.6563 Q1896.8125,21.7188 1896.8125,23.8125 Q1896.8125,25.9063 1897.5,26.9844 Q1898.1875,28.0469 1899.5313,28.0469 Q1900.1563,28.0469 1900.75,27.7813 Q1901.3438,27.5 1901.9688,26.9219 L1901.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1913" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1885" x2="1923" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L26" target="_top" title="key_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L26" xlink:show="new" xlink:title="key_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="60.8047" id="C_0000137163683637529037" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="1846" y="236.5"/>
       <ellipse cx="1884.4" cy="252.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1887.3688,258.1406 Q1886.7906,258.4375 1886.15,258.5781 Q1885.5094,258.7344 1884.8063,258.7344 Q1882.3063,258.7344 1880.9781,257.0938 Q1879.6656,255.4375 1879.6656,252.3125 Q1879.6656,249.1875 1880.9781,247.5313 Q1882.3063,245.875 1884.8063,245.875 Q1885.5094,245.875 1886.15,246.0313 Q1886.8063,246.1875 1887.3688,246.4844 L1887.3688,249.2031 Q1886.7438,248.625 1886.15,248.3594 Q1885.5563,248.0781 1884.9313,248.0781 Q1883.5875,248.0781 1882.9,249.1563 Q1882.2125,250.2188 1882.2125,252.3125 Q1882.2125,254.4063 1882.9,255.4844 Q1883.5875,256.5469 1884.9313,256.5469 Q1885.5563,256.5469 1886.15,256.2813 Q1886.7438,256 1887.3688,255.4219 L1887.3688,258.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="1903.6" y="256.6543">key_t</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="268.5" y2="268.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="1852" y="274.5"/>
       <ellipse cx="1857" cy="279.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L27" target="_top" title="key" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L27" xlink:show="new" xlink:title="key" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="1866" y="282.7104">key : std::string</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="1847" x2="1961" y1="289.3047" y2="289.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L30" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L30" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0001917560728132448300" style="stroke: #A80036; stroke-width: 1.5;" width="70" x="951" y="243"/>
       <ellipse cx="966" cy="259" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M968.9688,264.6406 Q968.3906,264.9375 967.75,265.0781 Q967.1094,265.2344 966.4063,265.2344 Q963.9063,265.2344 962.5781,263.5938 Q961.2656,261.9375 961.2656,258.8125 Q961.2656,255.6875 962.5781,254.0313 Q963.9063,252.375 966.4063,252.375 Q967.1094,252.375 967.75,252.5313 Q968.4063,252.6875 968.9688,252.9844 L968.9688,255.7031 Q968.3438,255.125 967.75,254.8594 Q967.1563,254.5781 966.5313,254.5781 Q965.1875,254.5781 964.5,255.6563 Q963.8125,256.7188 963.8125,258.8125 Q963.8125,260.9063 964.5,261.9844 Q965.1875,263.0469 966.5313,263.0469 Q967.1563,263.0469 967.75,262.7813 Q968.3438,262.5 968.9688,261.9219 L968.9688,264.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="980" y="263.1543">map</text>
@@ -88,8 +88,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="275" y2="275"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="952" x2="1020" y1="283" y2="283"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L34" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L34" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0001664022047310891203" style="stroke: #A80036; stroke-width: 1.5;" width="536" x="6" y="116"/>
       <ellipse cx="21" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,137.6406 Q23.3906,137.9375 22.75,138.0781 Q22.1094,138.2344 21.4063,138.2344 Q18.9063,138.2344 17.5781,136.5938 Q16.2656,134.9375 16.2656,131.8125 Q16.2656,128.6875 17.5781,127.0313 Q18.9063,125.375 21.4063,125.375 Q22.1094,125.375 22.75,125.5313 Q23.4063,125.6875 23.9688,125.9844 L23.9688,128.7031 Q23.3438,128.125 22.75,127.8594 Q22.1563,127.5781 21.5313,127.5781 Q20.1875,127.5781 19.5,128.6563 Q18.8125,129.7188 18.8125,131.8125 Q18.8125,133.9063 19.5,134.9844 Q20.1875,136.0469 21.5313,136.0469 Q22.1563,136.0469 22.75,135.7813 Q23.3438,135.5 23.9688,134.9219 L23.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="35" y="136.1543">map</text>
@@ -98,8 +98,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="541" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L37" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L37" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0000307700801045535833" style="stroke: #A80036; stroke-width: 1.5;" width="429" x="577.5" y="116"/>
       <ellipse cx="592.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M595.4688,137.6406 Q594.8906,137.9375 594.25,138.0781 Q593.6094,138.2344 592.9063,138.2344 Q590.4063,138.2344 589.0781,136.5938 Q587.7656,134.9375 587.7656,131.8125 Q587.7656,128.6875 589.0781,127.0313 Q590.4063,125.375 592.9063,125.375 Q593.6094,125.375 594.25,125.5313 Q594.9063,125.6875 595.4688,125.9844 L595.4688,128.7031 Q594.8438,128.125 594.25,127.8594 Q593.6563,127.5781 593.0313,127.5781 Q591.6875,127.5781 591,128.6563 Q590.3125,129.7188 590.3125,131.8125 Q590.3125,133.9063 591,134.9844 Q591.6875,136.0469 593.0313,136.0469 Q593.6563,136.0469 594.25,135.7813 Q594.8438,135.5 595.4688,134.9219 L595.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="606.5" y="136.1543">map</text>
@@ -108,8 +108,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="578.5" x2="1005.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L41" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L41" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0000548231528417484191" style="stroke: #A80036; stroke-width: 1.5;" width="515" x="1041.5" y="116"/>
       <ellipse cx="1056.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1059.4688,137.6406 Q1058.8906,137.9375 1058.25,138.0781 Q1057.6094,138.2344 1056.9063,138.2344 Q1054.4063,138.2344 1053.0781,136.5938 Q1051.7656,134.9375 1051.7656,131.8125 Q1051.7656,128.6875 1053.0781,127.0313 Q1054.4063,125.375 1056.9063,125.375 Q1057.6094,125.375 1058.25,125.5313 Q1058.9063,125.6875 1059.4688,125.9844 L1059.4688,128.7031 Q1058.8438,128.125 1058.25,127.8594 Q1057.6563,127.5781 1057.0313,127.5781 Q1055.6875,127.5781 1055,128.6563 Q1054.3125,129.7188 1054.3125,131.8125 Q1054.3125,133.9063 1055,134.9844 Q1055.6875,136.0469 1057.0313,136.0469 Q1057.6563,136.0469 1058.25,135.7813 Q1058.8438,135.5 1059.4688,134.9219 L1059.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1070.5" y="136.1543">map</text>
@@ -118,8 +118,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1042.5" x2="1555.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1qcqdp6my8s0i)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L46" target="_top" title="map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00038/t00038.cc#L46" xlink:show="new" xlink:title="map" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1taodrorzd4bf)" height="48" id="C_0001510200402118706005" style="stroke: #A80036; stroke-width: 1.5;" width="625" x="1591.5" y="116"/>
       <ellipse cx="1606.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1609.4688,137.6406 Q1608.8906,137.9375 1608.25,138.0781 Q1607.6094,138.2344 1606.9063,138.2344 Q1604.4063,138.2344 1603.0781,136.5938 Q1601.7656,134.9375 1601.7656,131.8125 Q1601.7656,128.6875 1603.0781,127.0313 Q1604.4063,125.375 1606.9063,125.375 Q1607.6094,125.375 1608.25,125.5313 Q1608.9063,125.6875 1609.4688,125.9844 L1609.4688,128.7031 Q1608.8438,128.125 1608.25,127.8594 Q1607.6563,127.5781 1607.0313,127.5781 Q1605.6875,127.5781 1605,128.6563 Q1604.3125,129.7188 1604.3125,131.8125 Q1604.3125,133.9063 1605,134.9844 Q1605.6875,136.0469 1607.0313,136.0469 Q1607.6563,136.0469 1608.25,135.7813 Q1608.8438,135.5 1609.4688,134.9219 L1609.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="27" x="1620.5" y="136.1543">map</text>
diff --git a/docs/test_cases/t00039.md b/docs/test_cases/t00039.md
index 28f54d8c..3f4eb548 100644
--- a/docs/test_cases/t00039.md
+++ b/docs/test_cases/t00039.md
@@ -89,3 +89,574 @@ template <typename T, typename M, typename N> struct FFF : public FF<T, M> {
 ```
 ## Generated UML diagrams
 ![t00039_class](./t00039_class.svg "Subclass class diagram filter test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00039::C",
+      "id": "241234977032861936",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00039::D",
+      "id": "1975187139659616784",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00039::E",
+      "id": "1959131184346890363",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 10
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "241234977032861936",
+          "is_virtual": false,
+          "name": "clanguml::t00039::C"
+        },
+        {
+          "access": "public",
+          "id": "1975187139659616784",
+          "is_virtual": false,
+          "name": "clanguml::t00039::D"
+        }
+      ],
+      "display_name": "clanguml::t00039::CD",
+      "id": "850483622527996929",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "CD",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 16
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1975187139659616784",
+          "is_virtual": false,
+          "name": "clanguml::t00039::D"
+        },
+        {
+          "access": "public",
+          "id": "1959131184346890363",
+          "is_virtual": false,
+          "name": "clanguml::t00039::E"
+        }
+      ],
+      "display_name": "clanguml::t00039::DE",
+      "id": "1316022308303681160",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "DE",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 18
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "241234977032861936",
+          "is_virtual": false,
+          "name": "clanguml::t00039::C"
+        },
+        {
+          "access": "public",
+          "id": "1975187139659616784",
+          "is_virtual": false,
+          "name": "clanguml::t00039::D"
+        },
+        {
+          "access": "public",
+          "id": "1959131184346890363",
+          "is_virtual": false,
+          "name": "clanguml::t00039::E"
+        }
+      ],
+      "display_name": "clanguml::t00039::CDE",
+      "id": "1877487144594774465",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "CDE",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 20
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00039::A",
+      "id": "1051171525946759825",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1051171525946759825",
+          "is_virtual": false,
+          "name": "clanguml::t00039::A"
+        }
+      ],
+      "display_name": "clanguml::t00039::AA",
+      "id": "1761969273600680013",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "AA",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 24
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1761969273600680013",
+          "is_virtual": false,
+          "name": "clanguml::t00039::AA"
+        }
+      ],
+      "display_name": "clanguml::t00039::AAA",
+      "id": "2158483243842147804",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00039/t00039.cc",
+            "line": 27
+          },
+          "type": "clanguml::t00039::B *"
+        }
+      ],
+      "methods": [],
+      "name": "AAA",
+      "namespace": "clanguml::t00039",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 26
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2158483243842147804",
+          "is_virtual": true,
+          "name": "clanguml::t00039::AAA"
+        }
+      ],
+      "display_name": "clanguml::t00039::ns2::AAAA",
+      "id": "1857294881176816154",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "AAAA",
+      "namespace": "clanguml::t00039::ns2",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 31
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00039::ns3::F<T>",
+      "id": "955785395599769805",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "t",
+          "source_location": {
+            "file": "../../tests/t00039/t00039.cc",
+            "line": 40
+          },
+          "type": "T *"
+        }
+      ],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00039::ns3",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 39
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "955785395599769805",
+          "is_virtual": false,
+          "name": "F<T>"
+        }
+      ],
+      "display_name": "clanguml::t00039::ns3::FF<T,M>",
+      "id": "1321996888067531304",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "m",
+          "source_location": {
+            "file": "../../tests/t00039/t00039.cc",
+            "line": 44
+          },
+          "type": "M *"
+        }
+      ],
+      "methods": [],
+      "name": "FF",
+      "namespace": "clanguml::t00039::ns3",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 43
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "M",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "955785395599769805",
+          "is_virtual": false,
+          "name": "F<T>"
+        }
+      ],
+      "display_name": "clanguml::t00039::ns3::FE<T,M>",
+      "id": "2008055732881129924",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "m",
+          "source_location": {
+            "file": "../../tests/t00039/t00039.cc",
+            "line": 48
+          },
+          "type": "M *"
+        }
+      ],
+      "methods": [],
+      "name": "FE",
+      "namespace": "clanguml::t00039::ns3",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 47
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "M",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1321996888067531304",
+          "is_virtual": false,
+          "name": "FF<T,M>"
+        }
+      ],
+      "display_name": "clanguml::t00039::ns3::FFF<T,M,N>",
+      "id": "1617455840736919039",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "n",
+          "source_location": {
+            "file": "../../tests/t00039/t00039.cc",
+            "line": 52
+          },
+          "type": "N *"
+        }
+      ],
+      "methods": [],
+      "name": "FFF",
+      "namespace": "clanguml::t00039::ns3",
+      "source_location": {
+        "file": "../../tests/t00039/t00039.cc",
+        "line": 51
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "M",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "N",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00039_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "241234977032861936",
+      "source": "850483622527996929",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1975187139659616784",
+      "source": "850483622527996929",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1975187139659616784",
+      "source": "1316022308303681160",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1959131184346890363",
+      "source": "1316022308303681160",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "241234977032861936",
+      "source": "1877487144594774465",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1975187139659616784",
+      "source": "1877487144594774465",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1959131184346890363",
+      "source": "1877487144594774465",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1051171525946759825",
+      "source": "1761969273600680013",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "247983380974491424",
+      "label": "b",
+      "source": "2158483243842147804",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1761969273600680013",
+      "source": "2158483243842147804",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2158483243842147804",
+      "source": "1857294881176816154",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "955785395599769805",
+      "source": "1321996888067531304",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "955785395599769805",
+      "source": "2008055732881129924",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1321996888067531304",
+      "source": "1617455840736919039",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00039"
+}
+```
diff --git a/docs/test_cases/t00039_class.svg b/docs/test_cases/t00039_class.svg
index c2f7d303..5fd6e339 100644
--- a/docs/test_cases/t00039_class.svg
+++ b/docs/test_cases/t00039_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="430px" preserveAspectRatio="none" style="width:622px;height:430px;" version="1.1" viewBox="0 0 622 430" width="622px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f30dnncq0jcc3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fcyuht2xdukis" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0000241234977032861936" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="16.5" y="14.5"/>
       <ellipse cx="31.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M34.4688,36.1406 Q33.8906,36.4375 33.25,36.5781 Q32.6094,36.7344 31.9063,36.7344 Q29.4063,36.7344 28.0781,35.0938 Q26.7656,33.4375 26.7656,30.3125 Q26.7656,27.1875 28.0781,25.5313 Q29.4063,23.875 31.9063,23.875 Q32.6094,23.875 33.25,24.0313 Q33.9063,24.1875 34.4688,24.4844 L34.4688,27.2031 Q33.8438,26.625 33.25,26.3594 Q32.6563,26.0781 32.0313,26.0781 Q30.6875,26.0781 30,27.1563 Q29.3125,28.2188 29.3125,30.3125 Q29.3125,32.4063 30,33.4844 Q30.6875,34.5469 32.0313,34.5469 Q32.6563,34.5469 33.25,34.2813 Q33.8438,34 34.4688,33.4219 L34.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="45.5" y="34.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="17.5" x2="55.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L8" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L8" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0001975187139659616784" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="98" y="14.5"/>
       <ellipse cx="113" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M115.9688,36.1406 Q115.3906,36.4375 114.75,36.5781 Q114.1094,36.7344 113.4063,36.7344 Q110.9063,36.7344 109.5781,35.0938 Q108.2656,33.4375 108.2656,30.3125 Q108.2656,27.1875 109.5781,25.5313 Q110.9063,23.875 113.4063,23.875 Q114.1094,23.875 114.75,24.0313 Q115.4063,24.1875 115.9688,24.4844 L115.9688,27.2031 Q115.3438,26.625 114.75,26.3594 Q114.1563,26.0781 113.5313,26.0781 Q112.1875,26.0781 111.5,27.1563 Q110.8125,28.2188 110.8125,30.3125 Q110.8125,32.4063 111.5,33.4844 Q112.1875,34.5469 113.5313,34.5469 Q114.1563,34.5469 114.75,34.2813 Q115.3438,34 115.9688,33.4219 L115.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="127" y="34.6543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="99" x2="138" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L10" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L10" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0001959131184346890363" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="180.5" y="14.5"/>
       <ellipse cx="195.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M198.4688,36.1406 Q197.8906,36.4375 197.25,36.5781 Q196.6094,36.7344 195.9063,36.7344 Q193.4063,36.7344 192.0781,35.0938 Q190.7656,33.4375 190.7656,30.3125 Q190.7656,27.1875 192.0781,25.5313 Q193.4063,23.875 195.9063,23.875 Q196.6094,23.875 197.25,24.0313 Q197.9063,24.1875 198.4688,24.4844 L198.4688,27.2031 Q197.8438,26.625 197.25,26.3594 Q196.6563,26.0781 196.0313,26.0781 Q194.6875,26.0781 194,27.1563 Q193.3125,28.2188 193.3125,30.3125 Q193.3125,32.4063 194,33.4844 Q194.6875,34.5469 196.0313,34.5469 Q196.6563,34.5469 197.25,34.2813 Q197.8438,34 198.4688,33.4219 L198.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="209.5" y="34.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="181.5" x2="219.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L16" target="_top" title="CD" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L16" xlink:show="new" xlink:title="CD" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0000850483622527996929" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="6" y="135.5"/>
       <ellipse cx="21" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,157.1406 Q23.3906,157.4375 22.75,157.5781 Q22.1094,157.7344 21.4063,157.7344 Q18.9063,157.7344 17.5781,156.0938 Q16.2656,154.4375 16.2656,151.3125 Q16.2656,148.1875 17.5781,146.5313 Q18.9063,144.875 21.4063,144.875 Q22.1094,144.875 22.75,145.0313 Q23.4063,145.1875 23.9688,145.4844 L23.9688,148.2031 Q23.3438,147.625 22.75,147.3594 Q22.1563,147.0781 21.5313,147.0781 Q20.1875,147.0781 19.5,148.1563 Q18.8125,149.2188 18.8125,151.3125 Q18.8125,153.4063 19.5,154.4844 Q20.1875,155.5469 21.5313,155.5469 Q22.1563,155.5469 22.75,155.2813 Q23.3438,155 23.9688,154.4219 L23.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="35" y="155.6543">CD</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="54" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L18" target="_top" title="DE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L18" xlink:show="new" xlink:title="DE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0001316022308303681160" style="stroke: #A80036; stroke-width: 1.5;" width="49" x="182" y="135.5"/>
       <ellipse cx="197" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M199.9688,157.1406 Q199.3906,157.4375 198.75,157.5781 Q198.1094,157.7344 197.4063,157.7344 Q194.9063,157.7344 193.5781,156.0938 Q192.2656,154.4375 192.2656,151.3125 Q192.2656,148.1875 193.5781,146.5313 Q194.9063,144.875 197.4063,144.875 Q198.1094,144.875 198.75,145.0313 Q199.4063,145.1875 199.9688,145.4844 L199.9688,148.2031 Q199.3438,147.625 198.75,147.3594 Q198.1563,147.0781 197.5313,147.0781 Q196.1875,147.0781 195.5,148.1563 Q194.8125,149.2188 194.8125,151.3125 Q194.8125,153.4063 195.5,154.4844 Q196.1875,155.5469 197.5313,155.5469 Q198.1563,155.5469 198.75,155.2813 Q199.3438,155 199.9688,154.4219 L199.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="17" x="211" y="155.6543">DE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183" x2="230" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L20" target="_top" title="CDE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L20" xlink:show="new" xlink:title="CDE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0001877487144594774465" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="90" y="135.5"/>
       <ellipse cx="105" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M107.9688,157.1406 Q107.3906,157.4375 106.75,157.5781 Q106.1094,157.7344 105.4063,157.7344 Q102.9063,157.7344 101.5781,156.0938 Q100.2656,154.4375 100.2656,151.3125 Q100.2656,148.1875 101.5781,146.5313 Q102.9063,144.875 105.4063,144.875 Q106.1094,144.875 106.75,145.0313 Q107.4063,145.1875 107.9688,145.4844 L107.9688,148.2031 Q107.3438,147.625 106.75,147.3594 Q106.1563,147.0781 105.5313,147.0781 Q104.1875,147.0781 103.5,148.1563 Q102.8125,149.2188 102.8125,151.3125 Q102.8125,153.4063 103.5,154.4844 Q104.1875,155.5469 105.5313,155.5469 Q106.1563,155.5469 106.75,155.2813 Q107.3438,155 107.9688,154.4219 L107.9688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="119" y="155.6543">CDE</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="91" x2="146" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L22" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L22" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0001051171525946759825" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="270.5" y="14.5"/>
       <ellipse cx="285.5" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M288.4688,36.1406 Q287.8906,36.4375 287.25,36.5781 Q286.6094,36.7344 285.9063,36.7344 Q283.4063,36.7344 282.0781,35.0938 Q280.7656,33.4375 280.7656,30.3125 Q280.7656,27.1875 282.0781,25.5313 Q283.4063,23.875 285.9063,23.875 Q286.6094,23.875 287.25,24.0313 Q287.9063,24.1875 288.4688,24.4844 L288.4688,27.2031 Q287.8438,26.625 287.25,26.3594 Q286.6563,26.0781 286.0313,26.0781 Q284.6875,26.0781 284,27.1563 Q283.3125,28.2188 283.3125,30.3125 Q283.3125,32.4063 284,33.4844 Q284.6875,34.5469 286.0313,34.5469 Q286.6563,34.5469 287.25,34.2813 Q287.8438,34 288.4688,33.4219 L288.4688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="299.5" y="34.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="271.5" x2="309.5" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L24" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L24" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0001761969273600680013" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="266.5" y="135.5"/>
       <ellipse cx="281.5" cy="151.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M284.4688,157.1406 Q283.8906,157.4375 283.25,157.5781 Q282.6094,157.7344 281.9063,157.7344 Q279.4063,157.7344 278.0781,156.0938 Q276.7656,154.4375 276.7656,151.3125 Q276.7656,148.1875 278.0781,146.5313 Q279.4063,144.875 281.9063,144.875 Q282.6094,144.875 283.25,145.0313 Q283.9063,145.1875 284.4688,145.4844 L284.4688,148.2031 Q283.8438,147.625 283.25,147.3594 Q282.6563,147.0781 282.0313,147.0781 Q280.6875,147.0781 280,148.1563 Q279.3125,149.2188 279.3125,151.3125 Q279.3125,153.4063 280,154.4844 Q280.6875,155.5469 282.0313,155.5469 Q282.6563,155.5469 283.25,155.2813 Q283.8438,155 284.4688,154.4219 L284.4688,157.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="295.5" y="155.6543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="167.5" y2="167.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="267.5" x2="313.5" y1="175.5" y2="175.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L26" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L26" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="60.8047" id="C_0002158483243842147804" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="259" y="250"/>
       <ellipse cx="277.15" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M280.1188,271.6406 Q279.5406,271.9375 278.9,272.0781 Q278.2594,272.2344 277.5563,272.2344 Q275.0563,272.2344 273.7281,270.5938 Q272.4156,268.9375 272.4156,265.8125 Q272.4156,262.6875 273.7281,261.0313 Q275.0563,259.375 277.5563,259.375 Q278.2594,259.375 278.9,259.5313 Q279.5563,259.6875 280.1188,259.9844 L280.1188,262.7031 Q279.4938,262.125 278.9,261.8594 Q278.3063,261.5781 277.6813,261.5781 Q276.3375,261.5781 275.65,262.6563 Q274.9625,263.7188 274.9625,265.8125 Q274.9625,267.9063 275.65,268.9844 Q276.3375,270.0469 277.6813,270.0469 Q278.3063,270.0469 278.9,269.7813 Q279.4938,269.5 280.1188,268.9219 L280.1188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="291.85" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="265" y="288"/>
       <ellipse cx="270" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L27" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L27" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="279" y="296.2104">b : B *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="260" x2="321" y1="302.8047" y2="302.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L31" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L31" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="48" id="C_0001857294881176816154" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="243" y="371"/>
       <ellipse cx="258" cy="387" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M260.9688,392.6406 Q260.3906,392.9375 259.75,393.0781 Q259.1094,393.2344 258.4063,393.2344 Q255.9063,393.2344 254.5781,391.5938 Q253.2656,389.9375 253.2656,386.8125 Q253.2656,383.6875 254.5781,382.0313 Q255.9063,380.375 258.4063,380.375 Q259.1094,380.375 259.75,380.5313 Q260.4063,380.6875 260.9688,380.9844 L260.9688,383.7031 Q260.3438,383.125 259.75,382.8594 Q259.1563,382.5781 258.5313,382.5781 Q257.1875,382.5781 256.5,383.6563 Q255.8125,384.7188 255.8125,386.8125 Q255.8125,388.9063 256.5,389.9844 Q257.1875,391.0469 258.5313,391.0469 Q259.1563,391.0469 259.75,390.7813 Q260.3438,390.5 260.9688,389.9219 L260.9688,392.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="63" x="272" y="391.1543">ns2::AAAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="403" y2="403"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="244" x2="337" y1="411" y2="411"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L39" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L39" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="60.8047" id="C_0000955785395599769805" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="447" y="8"/>
       <ellipse cx="462" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M464.9688,29.6406 Q464.3906,29.9375 463.75,30.0781 Q463.1094,30.2344 462.4063,30.2344 Q459.9063,30.2344 458.5781,28.5938 Q457.2656,26.9375 457.2656,23.8125 Q457.2656,20.6875 458.5781,19.0313 Q459.9063,17.375 462.4063,17.375 Q463.1094,17.375 463.75,17.5313 Q464.4063,17.6875 464.9688,17.9844 L464.9688,20.7031 Q464.3438,20.125 463.75,19.8594 Q463.1563,19.5781 462.5313,19.5781 Q461.1875,19.5781 460.5,20.6563 Q459.8125,21.7188 459.8125,23.8125 Q459.8125,25.9063 460.5,26.9844 Q461.1875,28.0469 462.5313,28.0469 Q463.1563,28.0469 463.75,27.7813 Q464.3438,27.5 464.9688,26.9219 L464.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="38" x="476" y="28.1543">ns3::F</text>
@@ -105,16 +105,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="523" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="453" y="46"/>
       <ellipse cx="458" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L40" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L40" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="467" y="54.2104">t : T *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="448" x2="527" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L43" target="_top" title="FF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L43" xlink:show="new" xlink:title="FF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="60.8047" id="C_0001321996888067531304" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="367.5" y="129"/>
       <ellipse cx="382.5" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M385.4688,150.6406 Q384.8906,150.9375 384.25,151.0781 Q383.6094,151.2344 382.9063,151.2344 Q380.4063,151.2344 379.0781,149.5938 Q377.7656,147.9375 377.7656,144.8125 Q377.7656,141.6875 379.0781,140.0313 Q380.4063,138.375 382.9063,138.375 Q383.6094,138.375 384.25,138.5313 Q384.9063,138.6875 385.4688,138.9844 L385.4688,141.7031 Q384.8438,141.125 384.25,140.8594 Q383.6563,140.5781 383.0313,140.5781 Q381.6875,140.5781 381,141.6563 Q380.3125,142.7188 380.3125,144.8125 Q380.3125,146.9063 381,147.9844 Q381.6875,149.0469 383.0313,149.0469 Q383.6563,149.0469 384.25,148.7813 Q384.8438,148.5 385.4688,147.9219 L385.4688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="45" x="396.5" y="149.1543">ns3::FF</text>
@@ -122,16 +122,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="450.5" y="138.1387">T,M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="373.5" y="167"/>
       <ellipse cx="378.5" cy="172" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L44" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L44" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="387.5" y="175.2104">m : M *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="368.5" x2="468.5" y1="181.8047" y2="181.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L47" target="_top" title="FE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L47" xlink:show="new" xlink:title="FE" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="60.8047" id="C_0002008055732881129924" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="505" y="129"/>
       <ellipse cx="520" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,150.6406 Q522.3906,150.9375 521.75,151.0781 Q521.1094,151.2344 520.4063,151.2344 Q517.9063,151.2344 516.5781,149.5938 Q515.2656,147.9375 515.2656,144.8125 Q515.2656,141.6875 516.5781,140.0313 Q517.9063,138.375 520.4063,138.375 Q521.1094,138.375 521.75,138.5313 Q522.4063,138.6875 522.9688,138.9844 L522.9688,141.7031 Q522.3438,141.125 521.75,140.8594 Q521.1563,140.5781 520.5313,140.5781 Q519.1875,140.5781 518.5,141.6563 Q517.8125,142.7188 517.8125,144.8125 Q517.8125,146.9063 518.5,147.9844 Q519.1875,149.0469 520.5313,149.0469 Q521.1563,149.0469 521.75,148.7813 Q522.3438,148.5 522.9688,147.9219 L522.9688,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="46" x="534" y="149.1543">ns3::FE</text>
@@ -139,16 +139,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="21" x="589" y="138.1387">T,M</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="161" y2="161"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="511" y="167"/>
       <ellipse cx="516" cy="172" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L48" target="_top" title="m" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L48" xlink:show="new" xlink:title="m" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="42" x="525" y="175.2104">m : M *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="607" y1="181.8047" y2="181.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f30dnncq0jcc3)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L51" target="_top" title="FFF" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L51" xlink:show="new" xlink:title="FFF" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcyuht2xdukis)" height="60.8047" id="C_0001617455840736919039" style="stroke: #A80036; stroke-width: 1.5;" width="122" x="357.5" y="250"/>
       <ellipse cx="372.5" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M375.4688,271.6406 Q374.8906,271.9375 374.25,272.0781 Q373.6094,272.2344 372.9063,272.2344 Q370.4063,272.2344 369.0781,270.5938 Q367.7656,268.9375 367.7656,265.8125 Q367.7656,262.6875 369.0781,261.0313 Q370.4063,259.375 372.9063,259.375 Q373.6094,259.375 374.25,259.5313 Q374.9063,259.6875 375.4688,259.9844 L375.4688,262.7031 Q374.8438,262.125 374.25,261.8594 Q373.6563,261.5781 373.0313,261.5781 Q371.6875,261.5781 371,262.6563 Q370.3125,263.7188 370.3125,265.8125 Q370.3125,267.9063 371,268.9844 Q371.6875,270.0469 373.0313,270.0469 Q373.6563,270.0469 374.25,269.7813 Q374.8438,269.5 375.4688,268.9219 L375.4688,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="52" x="386.5" y="270.1543">ns3::FFF</text>
@@ -156,11 +156,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="34" x="447.5" y="259.1387">T,M,N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="363.5" y="288"/>
       <ellipse cx="368.5" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L52" target="_top" title="n" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00039/t00039.cc#L52" xlink:show="new" xlink:title="n" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="377.5" y="296.2104">n : N *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="358.5" x2="478.5" y1="302.8047" y2="302.8047"/>
diff --git a/docs/test_cases/t00040.md b/docs/test_cases/t00040.md
index 717561b9..744b2123 100644
--- a/docs/test_cases/t00040.md
+++ b/docs/test_cases/t00040.md
@@ -65,3 +65,225 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00040_class](./t00040_class.svg "Relationship and access filter test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00040::A",
+      "id": "307580006083737677",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "protected",
+          "is_static": false,
+          "name": "ii_",
+          "source_location": {
+            "file": "../../tests/t00040/t00040.cc",
+            "line": 10
+          },
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "hidden_a_",
+          "source_location": {
+            "file": "../../tests/t00040/t00040.cc",
+            "line": 15
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_a",
+          "parameters": [],
+          "type": "int"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00040",
+      "source_location": {
+        "file": "../../tests/t00040/t00040.cc",
+        "line": 5
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "307580006083737677",
+          "is_virtual": false,
+          "name": "clanguml::t00040::A"
+        }
+      ],
+      "display_name": "clanguml::t00040::AA",
+      "id": "534115812779766127",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "AA",
+      "namespace": "clanguml::t00040",
+      "source_location": {
+        "file": "../../tests/t00040/t00040.cc",
+        "line": 18
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "534115812779766127",
+          "is_virtual": false,
+          "name": "clanguml::t00040::AA"
+        }
+      ],
+      "display_name": "clanguml::t00040::AAA",
+      "id": "745371908432158369",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00040/t00040.cc",
+            "line": 25
+          },
+          "type": "clanguml::t00040::B *"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "hidden_aaa_",
+          "source_location": {
+            "file": "../../tests/t00040/t00040.cc",
+            "line": 28
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_aaa",
+          "parameters": [],
+          "type": "int"
+        }
+      ],
+      "name": "AAA",
+      "namespace": "clanguml::t00040",
+      "source_location": {
+        "file": "../../tests/t00040/t00040.cc",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00040::R",
+      "id": "1539035020975101539",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [
+            {
+              "name": "a",
+              "type": "clanguml::t00040::A *"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "R",
+      "namespace": "clanguml::t00040",
+      "source_location": {
+        "file": "../../tests/t00040/t00040.cc",
+        "line": 31
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00040_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "307580006083737677",
+      "source": "534115812779766127",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "534115812779766127",
+      "source": "745371908432158369",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "307580006083737677",
+      "source": "1539035020975101539",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t00040"
+}
+```
diff --git a/docs/test_cases/t00040_class.svg b/docs/test_cases/t00040_class.svg
index e38717b0..03a18891 100644
--- a/docs/test_cases/t00040_class.svg
+++ b/docs/test_cases/t00040_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="334px" preserveAspectRatio="none" style="width:265px;height:334px;" version="1.1" viewBox="0 0 265 334" width="265px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="few7wnr1hfifc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fw5syefi2zh4i" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,50 +9,50 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#few7wnr1hfifc)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw5syefi2zh4i)" height="73.6094" id="C_0000307580006083737677" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="13" y="8"/>
       <ellipse cx="50.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M53.9188,29.6406 Q53.3406,29.9375 52.7,30.0781 Q52.0594,30.2344 51.3563,30.2344 Q48.8563,30.2344 47.5281,28.5938 Q46.2156,26.9375 46.2156,23.8125 Q46.2156,20.6875 47.5281,19.0313 Q48.8563,17.375 51.3563,17.375 Q52.0594,17.375 52.7,17.5313 Q53.3563,17.6875 53.9188,17.9844 L53.9188,20.7031 Q53.2938,20.125 52.7,19.8594 Q52.1063,19.5781 51.4813,19.5781 Q50.1375,19.5781 49.45,20.6563 Q48.7625,21.7188 48.7625,23.8125 Q48.7625,25.9063 49.45,26.9844 Q50.1375,28.0469 51.4813,28.0469 Q52.1063,28.0469 52.7,27.7813 Q53.2938,27.5 53.9188,26.9219 L53.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="70.05" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="19" y="46"/>
       <polygon fill="none" points="24,46,28,50,24,54,20,50" style="stroke: #B38D22; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L10" target="_top" title="ii_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L10" xlink:show="new" xlink:title="ii_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="33" y="54.2104">ii_ : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="14" x2="103" y1="60.8047" y2="60.8047"/>
     <ellipse cx="24" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="65" x="33" y="75.0151">get_a() : int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#few7wnr1hfifc)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L18" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L18" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw5syefi2zh4i)" height="48" id="C_0000534115812779766127" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="34.5" y="142"/>
       <ellipse cx="49.5" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M52.4688,163.6406 Q51.8906,163.9375 51.25,164.0781 Q50.6094,164.2344 49.9063,164.2344 Q47.4063,164.2344 46.0781,162.5938 Q44.7656,160.9375 44.7656,157.8125 Q44.7656,154.6875 46.0781,153.0313 Q47.4063,151.375 49.9063,151.375 Q50.6094,151.375 51.25,151.5313 Q51.9063,151.6875 52.4688,151.9844 L52.4688,154.7031 Q51.8438,154.125 51.25,153.8594 Q50.6563,153.5781 50.0313,153.5781 Q48.6875,153.5781 48,154.6563 Q47.3125,155.7188 47.3125,157.8125 Q47.3125,159.9063 48,160.9844 Q48.6875,162.0469 50.0313,162.0469 Q50.6563,162.0469 51.25,161.7813 Q51.8438,161.5 52.4688,160.9219 L52.4688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="63.5" y="162.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="174" y2="174"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="35.5" x2="81.5" y1="182" y2="182"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#few7wnr1hfifc)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L22" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L22" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw5syefi2zh4i)" height="73.6094" id="C_0000745371908432158369" style="stroke: #A80036; stroke-width: 1.5;" width="105" x="6" y="250"/>
       <ellipse cx="43.05" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M46.0188,271.6406 Q45.4406,271.9375 44.8,272.0781 Q44.1594,272.2344 43.4563,272.2344 Q40.9563,272.2344 39.6281,270.5938 Q38.3156,268.9375 38.3156,265.8125 Q38.3156,262.6875 39.6281,261.0313 Q40.9563,259.375 43.4563,259.375 Q44.1594,259.375 44.8,259.5313 Q45.4563,259.6875 46.0188,259.9844 L46.0188,262.7031 Q45.3938,262.125 44.8,261.8594 Q44.2063,261.5781 43.5813,261.5781 Q42.2375,261.5781 41.55,262.6563 Q40.8625,263.7188 40.8625,265.8125 Q40.8625,267.9063 41.55,268.9844 Q42.2375,270.0469 43.5813,270.0469 Q44.2063,270.0469 44.8,269.7813 Q45.3938,269.5 46.0188,268.9219 L46.0188,271.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="61.95" y="270.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="282" y2="282"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="288"/>
       <ellipse cx="17" cy="293" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L25" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L25" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="26" y="296.2104">b : B *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="110" y1="302.8047" y2="302.8047"/>
     <ellipse cx="17" cy="313.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="79" x="26" y="317.0151">get_aaa() : int</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#few7wnr1hfifc)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L31" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00040/t00040.cc#L31" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw5syefi2zh4i)" height="60.8047" id="C_0001539035020975101539" style="stroke: #A80036; stroke-width: 1.5;" width="115" x="139" y="14.5"/>
       <ellipse cx="188.25" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M191.2188,36.1406 Q190.6406,36.4375 190,36.5781 Q189.3594,36.7344 188.6563,36.7344 Q186.1563,36.7344 184.8281,35.0938 Q183.5156,33.4375 183.5156,30.3125 Q183.5156,27.1875 184.8281,25.5313 Q186.1563,23.875 188.6563,23.875 Q189.3594,23.875 190,24.0313 Q190.6563,24.1875 191.2188,24.4844 L191.2188,27.2031 Q190.5938,26.625 190,26.3594 Q189.4063,26.0781 188.7813,26.0781 Q187.4375,26.0781 186.75,27.1563 Q186.0625,28.2188 186.0625,30.3125 Q186.0625,32.4063 186.75,33.4844 Q187.4375,34.5469 188.7813,34.5469 Q189.4063,34.5469 190,34.2813 Q190.5938,34 191.2188,33.4219 L191.2188,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="208.75" y="34.6543">R</text>
diff --git a/docs/test_cases/t00041.md b/docs/test_cases/t00041.md
index 01ec9d8d..64df9137 100644
--- a/docs/test_cases/t00041.md
+++ b/docs/test_cases/t00041.md
@@ -76,3 +76,334 @@ struct NM : public N { };
 ```
 ## Generated UML diagrams
 ![t00041_class](./t00041_class.svg "Context diagram filter test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00041::R",
+      "id": "775317088453163919",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00041",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00041::D",
+      "id": "1798851434286108347",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "rr",
+          "source_location": {
+            "file": "../../tests/t00041/t00041.cc",
+            "line": 14
+          },
+          "type": "clanguml::t00041::RR *"
+        }
+      ],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00041",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00041::E",
+      "id": "2158730167547707264",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00041",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00041::F",
+      "id": "430600213408545846",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00041",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 19
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "775317088453163919",
+          "is_virtual": false,
+          "name": "clanguml::t00041::R"
+        }
+      ],
+      "display_name": "clanguml::t00041::RR",
+      "id": "175608867682236642",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e",
+          "source_location": {
+            "file": "../../tests/t00041/t00041.cc",
+            "line": 28
+          },
+          "type": "clanguml::t00041::E *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f",
+          "source_location": {
+            "file": "../../tests/t00041/t00041.cc",
+            "line": 29
+          },
+          "type": "clanguml::t00041::F *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "g",
+          "source_location": {
+            "file": "../../tests/t00041/t00041.cc",
+            "line": 30
+          },
+          "type": "detail::G *"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [
+            {
+              "name": "h",
+              "type": "clanguml::t00041::H *"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "RR",
+      "namespace": "clanguml::t00041",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 27
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "175608867682236642",
+          "is_virtual": false,
+          "name": "clanguml::t00041::RR"
+        }
+      ],
+      "display_name": "clanguml::t00041::RRR",
+      "id": "819254010294444715",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "RRR",
+      "namespace": "clanguml::t00041",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 35
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00041::ns1::N",
+      "id": "220253364661036147",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "N",
+      "namespace": "clanguml::t00041::ns1",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 38
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "220253364661036147",
+          "is_virtual": false,
+          "name": "clanguml::t00041::ns1::N"
+        }
+      ],
+      "display_name": "clanguml::t00041::ns1::NN",
+      "id": "618038667214398895",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "NN",
+      "namespace": "clanguml::t00041::ns1",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 40
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "220253364661036147",
+          "is_virtual": false,
+          "name": "clanguml::t00041::ns1::N"
+        }
+      ],
+      "display_name": "clanguml::t00041::ns1::NM",
+      "id": "1206750351408617127",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "NM",
+      "namespace": "clanguml::t00041::ns1",
+      "source_location": {
+        "file": "../../tests/t00041/t00041.cc",
+        "line": 42
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00041_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "175608867682236642",
+      "label": "rr",
+      "source": "1798851434286108347",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "648827958379389524",
+      "source": "175608867682236642",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2158730167547707264",
+      "label": "e",
+      "source": "175608867682236642",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "430600213408545846",
+      "label": "f",
+      "source": "175608867682236642",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "775317088453163919",
+      "source": "175608867682236642",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "175608867682236642",
+      "source": "819254010294444715",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "220253364661036147",
+      "source": "618038667214398895",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "220253364661036147",
+      "source": "1206750351408617127",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00041"
+}
+```
diff --git a/docs/test_cases/t00041_class.svg b/docs/test_cases/t00041_class.svg
index 6e80efb7..bc96a619 100644
--- a/docs/test_cases/t00041_class.svg
+++ b/docs/test_cases/t00041_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="381px" preserveAspectRatio="none" style="width:427px;height:381px;" version="1.1" viewBox="0 0 427 381" width="427px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f18xschy9u7x79" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fg1yzj5mesrhy" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,102 +9,102 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="57" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L9" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L9" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="48" id="C_0000775317088453163919" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="57" y="14.5"/>
       <ellipse cx="72" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M74.9688,36.1406 Q74.3906,36.4375 73.75,36.5781 Q73.1094,36.7344 72.4063,36.7344 Q69.9063,36.7344 68.5781,35.0938 Q67.2656,33.4375 67.2656,30.3125 Q67.2656,27.1875 68.5781,25.5313 Q69.9063,23.875 72.4063,23.875 Q73.1094,23.875 73.75,24.0313 Q74.4063,24.1875 74.9688,24.4844 L74.9688,27.2031 Q74.3438,26.625 73.75,26.3594 Q73.1563,26.0781 72.5313,26.0781 Q71.1875,26.0781 70.5,27.1563 Q69.8125,28.2188 69.8125,30.3125 Q69.8125,32.4063 70.5,33.4844 Q71.1875,34.5469 72.5313,34.5469 Q73.1563,34.5469 73.75,34.2813 Q74.3438,34 74.9688,33.4219 L74.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="86" y="34.6543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="58" x2="96" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="132" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L13" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L13" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="60.8047" id="C_0001798851434286108347" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="132" y="8"/>
       <ellipse cx="160.95" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M163.9188,29.6406 Q163.3406,29.9375 162.7,30.0781 Q162.0594,30.2344 161.3563,30.2344 Q158.8563,30.2344 157.5281,28.5938 Q156.2156,26.9375 156.2156,23.8125 Q156.2156,20.6875 157.5281,19.0313 Q158.8563,17.375 161.3563,17.375 Q162.0594,17.375 162.7,17.5313 Q163.3563,17.6875 163.9188,17.9844 L163.9188,20.7031 Q163.2938,20.125 162.7,19.8594 Q162.1063,19.5781 161.4813,19.5781 Q160.1375,19.5781 159.45,20.6563 Q158.7625,21.7188 158.7625,23.8125 Q158.7625,25.9063 159.45,26.9844 Q160.1375,28.0469 161.4813,28.0469 Q162.1063,28.0469 162.7,27.7813 Q163.2938,27.5 163.9188,26.9219 L163.9188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="178.05" y="28.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="46"/>
       <ellipse cx="143" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L14" target="_top" title="rr" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L14" xlink:show="new" xlink:title="rr" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="46" x="152" y="54.2104">rr : RR *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="203" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L17" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L17" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="48" id="C_0002158730167547707264" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="322"/>
       <ellipse cx="21" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,343.6406 Q23.3906,343.9375 22.75,344.0781 Q22.1094,344.2344 21.4063,344.2344 Q18.9063,344.2344 17.5781,342.5938 Q16.2656,340.9375 16.2656,337.8125 Q16.2656,334.6875 17.5781,333.0313 Q18.9063,331.375 21.4063,331.375 Q22.1094,331.375 22.75,331.5313 Q23.4063,331.6875 23.9688,331.9844 L23.9688,334.7031 Q23.3438,334.125 22.75,333.8594 Q22.1563,333.5781 21.5313,333.5781 Q20.1875,333.5781 19.5,334.6563 Q18.8125,335.7188 18.8125,337.8125 Q18.8125,339.9063 19.5,340.9844 Q20.1875,342.0469 21.5313,342.0469 Q22.1563,342.0469 22.75,341.7813 Q23.3438,341.5 23.9688,340.9219 L23.9688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="342.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L19" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L19" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="48" id="C_0000430600213408545846" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="81.5" y="322"/>
       <ellipse cx="96.5" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M99.4688,343.6406 Q98.8906,343.9375 98.25,344.0781 Q97.6094,344.2344 96.9063,344.2344 Q94.4063,344.2344 93.0781,342.5938 Q91.7656,340.9375 91.7656,337.8125 Q91.7656,334.6875 93.0781,333.0313 Q94.4063,331.375 96.9063,331.375 Q97.6094,331.375 98.25,331.5313 Q98.9063,331.6875 99.4688,331.9844 L99.4688,334.7031 Q98.8438,334.125 98.25,333.8594 Q97.6563,333.5781 97.0313,333.5781 Q95.6875,333.5781 95,334.6563 Q94.3125,335.7188 94.3125,337.8125 Q94.3125,339.9063 95,340.9844 Q95.6875,342.0469 97.0313,342.0469 Q97.6563,342.0469 98.25,341.7813 Q98.8438,341.5 99.4688,340.9219 L99.4688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="110.5" y="342.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="119.5" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="99.2188" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="43" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L27" target="_top" title="RR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L27" xlink:show="new" xlink:title="RR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="99.2188" id="C_0000175608867682236642" style="stroke: #A80036; stroke-width: 1.5;" width="116" x="43" y="146"/>
       <ellipse cx="88.75" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M91.7188,167.6406 Q91.1406,167.9375 90.5,168.0781 Q89.8594,168.2344 89.1563,168.2344 Q86.6563,168.2344 85.3281,166.5938 Q84.0156,164.9375 84.0156,161.8125 Q84.0156,158.6875 85.3281,157.0313 Q86.6563,155.375 89.1563,155.375 Q89.8594,155.375 90.5,155.5313 Q91.1563,155.6875 91.7188,155.9844 L91.7188,158.7031 Q91.0938,158.125 90.5,157.8594 Q89.9063,157.5781 89.2813,157.5781 Q87.9375,157.5781 87.25,158.6563 Q86.5625,159.7188 86.5625,161.8125 Q86.5625,163.9063 87.25,164.9844 Q87.9375,166.0469 89.2813,166.0469 Q89.9063,166.0469 90.5,165.7813 Q91.0938,165.5 91.7188,164.9219 L91.7188,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="109.25" y="166.1543">RR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="184"/>
       <ellipse cx="54" cy="189" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L28" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L28" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="36" x="63" y="192.2104">e : E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="196.8047"/>
       <ellipse cx="54" cy="201.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L29" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L29" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="63" y="205.0151">f : F *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="49" y="209.6094"/>
       <ellipse cx="54" cy="214.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L30" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L30" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="77" x="63" y="217.8198">g : detail::G *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="44" x2="158" y1="224.4141" y2="224.4141"/>
     <ellipse cx="54" cy="235.4141" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="90" x="63" y="238.6245">foo(H * h) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="322"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L35" target="_top" title="RRR" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L35" xlink:show="new" xlink:title="RRR" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="48" id="C_0000819254010294444715" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="156" y="322"/>
       <ellipse cx="171" cy="338" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,343.6406 Q173.3906,343.9375 172.75,344.0781 Q172.1094,344.2344 171.4063,344.2344 Q168.9063,344.2344 167.5781,342.5938 Q166.2656,340.9375 166.2656,337.8125 Q166.2656,334.6875 167.5781,333.0313 Q168.9063,331.375 171.4063,331.375 Q172.1094,331.375 172.75,331.5313 Q173.4063,331.6875 173.9688,331.9844 L173.9688,334.7031 Q173.3438,334.125 172.75,333.8594 Q172.1563,333.5781 171.5313,333.5781 Q170.1875,333.5781 169.5,334.6563 Q168.8125,335.7188 168.8125,337.8125 Q168.8125,339.9063 169.5,340.9844 Q170.1875,342.0469 171.5313,342.0469 Q172.1563,342.0469 172.75,341.7813 Q173.3438,341.5 173.9688,340.9219 L173.9688,343.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="185" y="342.1543">RRR</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="354" y2="354"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="211" y1="362" y2="362"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="289" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L38" target="_top" title="N" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L38" xlink:show="new" xlink:title="N" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="48" id="C_0000220253364661036147" style="stroke: #A80036; stroke-width: 1.5;" width="72" x="289" y="14.5"/>
       <ellipse cx="304" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M306.9688,36.1406 Q306.3906,36.4375 305.75,36.5781 Q305.1094,36.7344 304.4063,36.7344 Q301.9063,36.7344 300.5781,35.0938 Q299.2656,33.4375 299.2656,30.3125 Q299.2656,27.1875 300.5781,25.5313 Q301.9063,23.875 304.4063,23.875 Q305.1094,23.875 305.75,24.0313 Q306.4063,24.1875 306.9688,24.4844 L306.9688,27.2031 Q306.3438,26.625 305.75,26.3594 Q305.1563,26.0781 304.5313,26.0781 Q303.1875,26.0781 302.5,27.1563 Q301.8125,28.2188 301.8125,30.3125 Q301.8125,32.4063 302.5,33.4844 Q303.1875,34.5469 304.5313,34.5469 Q305.1563,34.5469 305.75,34.2813 Q306.3438,34 306.9688,33.4219 L306.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="40" x="318" y="34.6543">ns1::N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290" x2="360" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="217.5" y="171.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L40" target="_top" title="NN" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L40" xlink:show="new" xlink:title="NN" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="48" id="C_0000618038667214398895" style="stroke: #A80036; stroke-width: 1.5;" width="81" x="217.5" y="171.5"/>
       <ellipse cx="232.5" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.4688,193.1406 Q234.8906,193.4375 234.25,193.5781 Q233.6094,193.7344 232.9063,193.7344 Q230.4063,193.7344 229.0781,192.0938 Q227.7656,190.4375 227.7656,187.3125 Q227.7656,184.1875 229.0781,182.5313 Q230.4063,180.875 232.9063,180.875 Q233.6094,180.875 234.25,181.0313 Q234.9063,181.1875 235.4688,181.4844 L235.4688,184.2031 Q234.8438,183.625 234.25,183.3594 Q233.6563,183.0781 233.0313,183.0781 Q231.6875,183.0781 231,184.1563 Q230.3125,185.2188 230.3125,187.3125 Q230.3125,189.4063 231,190.4844 Q231.6875,191.5469 233.0313,191.5469 Q233.6563,191.5469 234.25,191.2813 Q234.8438,191 235.4688,190.4219 L235.4688,193.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="49" x="246.5" y="191.6543">ns1::NN</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="203.5" y2="203.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="218.5" x2="297.5" y1="211.5" y2="211.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f18xschy9u7x79)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="334" y="171.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L42" target="_top" title="NM" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00041/t00041.cc#L42" xlink:show="new" xlink:title="NM" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fg1yzj5mesrhy)" height="48" id="C_0001206750351408617127" style="stroke: #A80036; stroke-width: 1.5;" width="82" x="334" y="171.5"/>
       <ellipse cx="349" cy="187.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M351.9688,193.1406 Q351.3906,193.4375 350.75,193.5781 Q350.1094,193.7344 349.4063,193.7344 Q346.9063,193.7344 345.5781,192.0938 Q344.2656,190.4375 344.2656,187.3125 Q344.2656,184.1875 345.5781,182.5313 Q346.9063,180.875 349.4063,180.875 Q350.1094,180.875 350.75,181.0313 Q351.4063,181.1875 351.9688,181.4844 L351.9688,184.2031 Q351.3438,183.625 350.75,183.3594 Q350.1563,183.0781 349.5313,183.0781 Q348.1875,183.0781 347.5,184.1563 Q346.8125,185.2188 346.8125,187.3125 Q346.8125,189.4063 347.5,190.4844 Q348.1875,191.5469 349.5313,191.5469 Q350.1563,191.5469 350.75,191.2813 Q351.3438,191 351.9688,190.4219 L351.9688,193.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="50" x="363" y="191.6543">ns1::NM</text>
diff --git a/docs/test_cases/t00042.md b/docs/test_cases/t00042.md
index 65bf767e..228b9a48 100644
--- a/docs/test_cases/t00042.md
+++ b/docs/test_cases/t00042.md
@@ -61,3 +61,233 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00042_class](./t00042_class.svg "Specialization class template diagram filter test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00042::A<T>",
+      "id": "462160951579835462",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00042/t00042.cc",
+            "line": 6
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00042",
+      "source_location": {
+        "file": "../../tests/t00042/t00042.cc",
+        "line": 5
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00042::A<void>",
+      "id": "1422802342059669545",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00042",
+      "source_location": {
+        "file": "../../tests/t00042/t00042.cc",
+        "line": 9
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "void"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00042::B<T,K>",
+      "id": "1414456934388678010",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00042/t00042.cc",
+            "line": 14
+          },
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "bb",
+          "source_location": {
+            "file": "../../tests/t00042/t00042.cc",
+            "line": 15
+          },
+          "type": "K"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00042",
+      "source_location": {
+        "file": "../../tests/t00042/t00042.cc",
+        "line": 13
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "K",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00042::A<double>",
+      "id": "364538479078826988",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00042",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "double"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00042::A<std::string>",
+      "id": "496773262538580186",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00042",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00042::B<int,float>",
+      "id": "1833471931530161359",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00042",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "float"
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00042_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "462160951579835462",
+      "source": "1422802342059669545",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "462160951579835462",
+      "source": "364538479078826988",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "462160951579835462",
+      "source": "496773262538580186",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1414456934388678010",
+      "source": "1833471931530161359",
+      "type": "instantiation"
+    }
+  ],
+  "using_namespace": "clanguml::t00042"
+}
+```
diff --git a/docs/test_cases/t00042_class.svg b/docs/test_cases/t00042_class.svg
index fdfc3357..5ad739eb 100644
--- a/docs/test_cases/t00042_class.svg
+++ b/docs/test_cases/t00042_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="200px" preserveAspectRatio="none" style="width:479px;height:200px;" version="1.1" viewBox="0 0 479 200" width="479px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1a3sx50yvavd5" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fl72pw8gd2g2d" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3sx50yvavd5)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="127.5" y="122.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl72pw8gd2g2d)" height="60.8047" id="C_0000462160951579835462" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="127.5" y="122.5"/>
       <ellipse cx="142.95" cy="138.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M145.9188,144.1406 Q145.3406,144.4375 144.7,144.5781 Q144.0594,144.7344 143.3563,144.7344 Q140.8563,144.7344 139.5281,143.0938 Q138.2156,141.4375 138.2156,138.3125 Q138.2156,135.1875 139.5281,133.5313 Q140.8563,131.875 143.3563,131.875 Q144.0594,131.875 144.7,132.0313 Q145.3563,132.1875 145.9188,132.4844 L145.9188,135.2031 Q145.2938,134.625 144.7,134.3594 Q144.1063,134.0781 143.4813,134.0781 Q142.1375,134.0781 141.45,135.1563 Q140.7625,136.2188 140.7625,138.3125 Q140.7625,140.4063 141.45,141.4844 Q142.1375,142.5469 143.4813,142.5469 Q144.1063,142.5469 144.7,142.2813 Q145.2938,142 145.9188,141.4219 L145.9188,144.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157.05" y="142.6543">A</text>
@@ -18,16 +18,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="174.5" y="131.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="178.5" y1="154.5" y2="154.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="133.5" y="160.5"/>
       <ellipse cx="138.5" cy="165.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L6" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L6" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="147.5" y="168.7104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="128.5" x2="178.5" y1="175.3047" y2="175.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3sx50yvavd5)" height="48" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="69" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl72pw8gd2g2d)" height="48" id="C_0001422802342059669545" style="stroke: #A80036; stroke-width: 1.5;" width="69" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
@@ -36,8 +36,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="74" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="74" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1a3sx50yvavd5)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="388" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fl72pw8gd2g2d)" height="73.6094" id="C_0001414456934388678010" style="stroke: #A80036; stroke-width: 1.5;" width="63" x="388" y="116"/>
       <ellipse cx="403" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M405.9688,137.6406 Q405.3906,137.9375 404.75,138.0781 Q404.1094,138.2344 403.4063,138.2344 Q400.9063,138.2344 399.5781,136.5938 Q398.2656,134.9375 398.2656,131.8125 Q398.2656,128.6875 399.5781,127.0313 Q400.9063,125.375 403.4063,125.375 Q404.1094,125.375 404.75,125.5313 Q405.4063,125.6875 405.9688,125.9844 L405.9688,128.7031 Q405.3438,128.125 404.75,127.8594 Q404.1563,127.5781 403.5313,127.5781 Q402.1875,127.5781 401.5,128.6563 Q400.8125,129.7188 400.8125,131.8125 Q400.8125,133.9063 401.5,134.9844 Q402.1875,136.0469 403.5313,136.0469 Q404.1563,136.0469 404.75,135.7813 Q405.3438,135.5 405.9688,134.9219 L405.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="417" y="136.1543">B</text>
@@ -45,22 +45,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="19" x="434" y="125.1387">T,K</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="389" x2="450" y1="148" y2="148"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="394" y="154"/>
       <ellipse cx="399" cy="159" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L14" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L14" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="408" y="162.2104">b : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="394" y="166.8047"/>
       <ellipse cx="399" cy="171.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L15" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00042/t00042.cc#L15" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="408" y="175.0151">bb : K</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="389" x2="450" y1="181.6094" y2="181.6094"/>
-    <rect fill="#FEFECE" filter="url(#f1a3sx50yvavd5)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="110" y="8"/>
+    <rect fill="#FEFECE" filter="url(#fl72pw8gd2g2d)" height="48" id="C_0000364538479078826988" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="110" y="8"/>
     <ellipse cx="125" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M127.9688,29.6406 Q127.3906,29.9375 126.75,30.0781 Q126.1094,30.2344 125.4063,30.2344 Q122.9063,30.2344 121.5781,28.5938 Q120.2656,26.9375 120.2656,23.8125 Q120.2656,20.6875 121.5781,19.0313 Q122.9063,17.375 125.4063,17.375 Q126.1094,17.375 126.75,17.5313 Q127.4063,17.6875 127.9688,17.9844 L127.9688,20.7031 Q127.3438,20.125 126.75,19.8594 Q126.1563,19.5781 125.5313,19.5781 Q124.1875,19.5781 123.5,20.6563 Q122.8125,21.7188 122.8125,23.8125 Q122.8125,25.9063 123.5,26.9844 Q124.1875,28.0469 125.5313,28.0469 Q126.1563,28.0469 126.75,27.7813 Q127.3438,27.5 127.9688,26.9219 L127.9688,29.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="139" y="28.1543">A</text>
@@ -68,7 +68,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="156" y="17.1387">double</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="111" x2="196" y1="40" y2="40"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="111" x2="196" y1="48" y2="48"/>
-    <rect fill="#FEFECE" filter="url(#f1a3sx50yvavd5)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="232.5" y="8"/>
+    <rect fill="#FEFECE" filter="url(#fl72pw8gd2g2d)" height="48" id="C_0000496773262538580186" style="stroke: #A80036; stroke-width: 1.5;" width="106" x="232.5" y="8"/>
     <ellipse cx="247.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M250.4688,29.6406 Q249.8906,29.9375 249.25,30.0781 Q248.6094,30.2344 247.9063,30.2344 Q245.4063,30.2344 244.0781,28.5938 Q242.7656,26.9375 242.7656,23.8125 Q242.7656,20.6875 244.0781,19.0313 Q245.4063,17.375 247.9063,17.375 Q248.6094,17.375 249.25,17.5313 Q249.9063,17.6875 250.4688,17.9844 L250.4688,20.7031 Q249.8438,20.125 249.25,19.8594 Q248.6563,19.5781 248.0313,19.5781 Q246.6875,19.5781 246,20.6563 Q245.3125,21.7188 245.3125,23.8125 Q245.3125,25.9063 246,26.9844 Q246.6875,28.0469 248.0313,28.0469 Q248.6563,28.0469 249.25,27.7813 Q249.8438,27.5 250.4688,26.9219 L250.4688,29.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="261.5" y="28.1543">A</text>
@@ -76,7 +76,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="62" x="278.5" y="17.1387">std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="233.5" x2="337.5" y1="40" y2="40"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="233.5" x2="337.5" y1="48" y2="48"/>
-    <rect fill="#FEFECE" filter="url(#f1a3sx50yvavd5)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="373.5" y="8"/>
+    <rect fill="#FEFECE" filter="url(#fl72pw8gd2g2d)" height="48" id="C_0001833471931530161359" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="373.5" y="8"/>
     <ellipse cx="388.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M391.4688,29.6406 Q390.8906,29.9375 390.25,30.0781 Q389.6094,30.2344 388.9063,30.2344 Q386.4063,30.2344 385.0781,28.5938 Q383.7656,26.9375 383.7656,23.8125 Q383.7656,20.6875 385.0781,19.0313 Q386.4063,17.375 388.9063,17.375 Q389.6094,17.375 390.25,17.5313 Q390.9063,17.6875 391.4688,17.9844 L391.4688,20.7031 Q390.8438,20.125 390.25,19.8594 Q389.6563,19.5781 389.0313,19.5781 Q387.6875,19.5781 387,20.6563 Q386.3125,21.7188 386.3125,23.8125 Q386.3125,25.9063 387,26.9844 Q387.6875,28.0469 389.0313,28.0469 Q389.6563,28.0469 390.25,27.7813 Q390.8438,27.5 391.4688,26.9219 L391.4688,29.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="402.5" y="28.1543">B</text>
diff --git a/docs/test_cases/t00043.md b/docs/test_cases/t00043.md
index 5f6aa811..0075df73 100644
--- a/docs/test_cases/t00043.md
+++ b/docs/test_cases/t00043.md
@@ -80,3 +80,487 @@ struct J {
 ```
 ## Generated UML diagrams
 ![t00043_class](./t00043_class.svg "Dependants and dependencies class diagram filter test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "display_name": "clanguml::t00043::dependants",
+      "elements": [
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependants::A",
+          "id": "1454679300998460550",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "A",
+          "namespace": "clanguml::t00043::dependants",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 4
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependants::B",
+          "id": "1972977265990430931",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "b",
+              "parameters": [
+                {
+                  "name": "a",
+                  "type": "clanguml::t00043::dependants::A *"
+                }
+              ],
+              "type": "void"
+            }
+          ],
+          "name": "B",
+          "namespace": "clanguml::t00043::dependants",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 6
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependants::BB",
+          "id": "1906291555025945295",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "bb",
+              "parameters": [
+                {
+                  "name": "a",
+                  "type": "clanguml::t00043::dependants::A *"
+                }
+              ],
+              "type": "void"
+            }
+          ],
+          "name": "BB",
+          "namespace": "clanguml::t00043::dependants",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 10
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependants::C",
+          "id": "823759225351121534",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "c",
+              "parameters": [
+                {
+                  "name": "b",
+                  "type": "clanguml::t00043::dependants::B *"
+                }
+              ],
+              "type": "void"
+            }
+          ],
+          "name": "C",
+          "namespace": "clanguml::t00043::dependants",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 14
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependants::D",
+          "id": "2277976215348279426",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "d",
+              "parameters": [
+                {
+                  "name": "c",
+                  "type": "clanguml::t00043::dependants::C *"
+                }
+              ],
+              "type": "void"
+            },
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "dd",
+              "parameters": [
+                {
+                  "name": "bb",
+                  "type": "clanguml::t00043::dependants::BB *"
+                }
+              ],
+              "type": "void"
+            }
+          ],
+          "name": "D",
+          "namespace": "clanguml::t00043::dependants",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 18
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependants::E",
+          "id": "1694685540293810116",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "e",
+              "parameters": [
+                {
+                  "name": "d",
+                  "type": "clanguml::t00043::dependants::D *"
+                }
+              ],
+              "type": "void"
+            }
+          ],
+          "name": "E",
+          "namespace": "clanguml::t00043::dependants",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 23
+          },
+          "template_parameters": [],
+          "type": "class"
+        }
+      ],
+      "name": "dependants",
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t00043::dependencies",
+      "elements": [
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependencies::G",
+          "id": "736400571183204899",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "G",
+          "namespace": "clanguml::t00043::dependencies",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 32
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependencies::GG",
+          "id": "1522297681294871411",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "GG",
+          "namespace": "clanguml::t00043::dependencies",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 34
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependencies::H",
+          "id": "1534191494825314170",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "h",
+              "parameters": [
+                {
+                  "name": "g",
+                  "type": "clanguml::t00043::dependencies::G *"
+                }
+              ],
+              "type": "void"
+            },
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "hh",
+              "parameters": [
+                {
+                  "name": "gg",
+                  "type": "clanguml::t00043::dependencies::GG *"
+                }
+              ],
+              "type": "void"
+            }
+          ],
+          "name": "H",
+          "namespace": "clanguml::t00043::dependencies",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 36
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependencies::I",
+          "id": "97422543769740359",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "i",
+              "parameters": [
+                {
+                  "name": "h",
+                  "type": "clanguml::t00043::dependencies::H *"
+                }
+              ],
+              "type": "void"
+            }
+          ],
+          "name": "I",
+          "namespace": "clanguml::t00043::dependencies",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 45
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00043::dependencies::J",
+          "id": "1498530043106438011",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [
+            {
+              "access": "public",
+              "is_const": false,
+              "is_defaulted": false,
+              "is_implicit": false,
+              "is_pure_virtual": false,
+              "is_static": false,
+              "is_virtual": false,
+              "name": "i",
+              "parameters": [
+                {
+                  "name": "i",
+                  "type": "clanguml::t00043::dependencies::I *"
+                }
+              ],
+              "type": "void"
+            }
+          ],
+          "name": "J",
+          "namespace": "clanguml::t00043::dependencies",
+          "source_location": {
+            "file": "../../tests/t00043/t00043.cc",
+            "line": 49
+          },
+          "template_parameters": [],
+          "type": "class"
+        }
+      ],
+      "name": "dependencies",
+      "type": "namespace"
+    }
+  ],
+  "name": "t00043_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1454679300998460550",
+      "source": "1972977265990430931",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1454679300998460550",
+      "source": "1906291555025945295",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1972977265990430931",
+      "source": "823759225351121534",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "823759225351121534",
+      "source": "2277976215348279426",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1906291555025945295",
+      "source": "2277976215348279426",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2277976215348279426",
+      "source": "1694685540293810116",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "736400571183204899",
+      "source": "1534191494825314170",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1522297681294871411",
+      "source": "1534191494825314170",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1534191494825314170",
+      "source": "97422543769740359",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "97422543769740359",
+      "source": "1498530043106438011",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t00043"
+}
+```
diff --git a/docs/test_cases/t00043_class.svg b/docs/test_cases/t00043_class.svg
index 151d49ca..2aeb44aa 100644
--- a/docs/test_cases/t00043_class.svg
+++ b/docs/test_cases/t00043_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="645px" preserveAspectRatio="none" style="width:749px;height:645px;" version="1.1" viewBox="0 0 749 645" width="749px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1szndqoe5cho1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fti7fnpz9rk1w" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1szndqoe5cho1)" points="22,24,122,24,129,46.2969,455,46.2969,455,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fti7fnpz9rk1w)" points="22,24,122,24,129,46.2969,455,46.2969,455,633,22,633,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f1szndqoe5cho1)" points="479,24,597,24,604,46.2969,727,46.2969,727,518.5,479,518.5,479,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fti7fnpz9rk1w)" points="479,24,597,24,604,46.2969,727,46.2969,727,518.5,479,518.5,479,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="479" x2="604" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="483" y="38.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="220" y="569"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="48" id="C_0001454679300998460550" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="220" y="569"/>
       <ellipse cx="235" cy="585" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M237.9688,590.6406 Q237.3906,590.9375 236.75,591.0781 Q236.1094,591.2344 235.4063,591.2344 Q232.9063,591.2344 231.5781,589.5938 Q230.2656,587.9375 230.2656,584.8125 Q230.2656,581.6875 231.5781,580.0313 Q232.9063,578.375 235.4063,578.375 Q236.1094,578.375 236.75,578.5313 Q237.4063,578.6875 237.9688,578.9844 L237.9688,581.7031 Q237.3438,581.125 236.75,580.8594 Q236.1563,580.5781 235.5313,580.5781 Q234.1875,580.5781 233.5,581.6563 Q232.8125,582.7188 232.8125,584.8125 Q232.8125,586.9063 233.5,587.9844 Q234.1875,589.0469 235.5313,589.0469 Q236.1563,589.0469 236.75,588.7813 Q237.3438,588.5 237.9688,587.9219 L237.9688,590.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="249" y="589.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="259" y1="601" y2="601"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="221" x2="259" y1="609" y2="609"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="259.5" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="60.8047" id="C_0001972977265990430931" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="259.5" y="448"/>
       <ellipse cx="340.75" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M343.7188,469.6406 Q343.1406,469.9375 342.5,470.0781 Q341.8594,470.2344 341.1563,470.2344 Q338.6563,470.2344 337.3281,468.5938 Q336.0156,466.9375 336.0156,463.8125 Q336.0156,460.6875 337.3281,459.0313 Q338.6563,457.375 341.1563,457.375 Q341.8594,457.375 342.5,457.5313 Q343.1563,457.6875 343.7188,457.9844 L343.7188,460.7031 Q343.0938,460.125 342.5,459.8594 Q341.9063,459.5781 341.2813,459.5781 Q339.9375,459.5781 339.25,460.6563 Q338.5625,461.7188 338.5625,463.8125 Q338.5625,465.9063 339.25,466.9844 Q339.9375,468.0469 341.2813,468.0469 Q341.9063,468.0469 342.5,467.7813 Q343.0938,467.5 343.7188,466.9219 L343.7188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="361.25" y="468.1543">B</text>
@@ -33,8 +33,8 @@
       <ellipse cx="270.5" cy="499" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="279.5" y="502.2104">b(dependants::A * a) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="38" y="448"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L10" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L10" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="60.8047" id="C_0001906291555025945295" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="38" y="448"/>
       <ellipse cx="118.75" cy="464" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M121.7188,469.6406 Q121.1406,469.9375 120.5,470.0781 Q119.8594,470.2344 119.1563,470.2344 Q116.6563,470.2344 115.3281,468.5938 Q114.0156,466.9375 114.0156,463.8125 Q114.0156,460.6875 115.3281,459.0313 Q116.6563,457.375 119.1563,457.375 Q119.8594,457.375 120.5,457.5313 Q121.1563,457.6875 121.7188,457.9844 L121.7188,460.7031 Q121.0938,460.125 120.5,459.8594 Q119.9063,459.5781 119.2813,459.5781 Q117.9375,459.5781 117.25,460.6563 Q116.5625,461.7188 116.5625,463.8125 Q116.5625,465.9063 117.25,466.9844 Q117.9375,468.0469 119.2813,468.0469 Q119.9063,468.0469 120.5,467.7813 Q121.0938,467.5 121.7188,466.9219 L121.7188,469.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="139.25" y="468.1543">BB</text>
@@ -43,8 +43,8 @@
       <ellipse cx="49" cy="499" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="58" y="502.2104">bb(dependants::A * a) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="236.5" y="320.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="60.8047" id="C_0000823759225351121534" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="236.5" y="320.5"/>
       <ellipse cx="317.75" cy="336.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M320.7188,342.1406 Q320.1406,342.4375 319.5,342.5781 Q318.8594,342.7344 318.1563,342.7344 Q315.6563,342.7344 314.3281,341.0938 Q313.0156,339.4375 313.0156,336.3125 Q313.0156,333.1875 314.3281,331.5313 Q315.6563,329.875 318.1563,329.875 Q318.8594,329.875 319.5,330.0313 Q320.1563,330.1875 320.7188,330.4844 L320.7188,333.2031 Q320.0938,332.625 319.5,332.3594 Q318.9063,332.0781 318.2813,332.0781 Q316.9375,332.0781 316.25,333.1563 Q315.5625,334.2188 315.5625,336.3125 Q315.5625,338.4063 316.25,339.4844 Q316.9375,340.5469 318.2813,340.5469 Q318.9063,340.5469 319.5,340.2813 Q320.0938,340 320.7188,339.4219 L320.7188,342.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338.25" y="340.6543">C</text>
@@ -53,8 +53,8 @@
       <ellipse cx="247.5" cy="371.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="256.5" y="374.7104">c(dependants::B * b) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="202" x="97" y="180"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L18" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L18" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="73.6094" id="C_0002277976215348279426" style="stroke: #A80036; stroke-width: 1.5;" width="202" x="97" y="180"/>
       <ellipse cx="189.25" cy="196" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.2188,201.6406 Q191.6406,201.9375 191,202.0781 Q190.3594,202.2344 189.6563,202.2344 Q187.1563,202.2344 185.8281,200.5938 Q184.5156,198.9375 184.5156,195.8125 Q184.5156,192.6875 185.8281,191.0313 Q187.1563,189.375 189.6563,189.375 Q190.3594,189.375 191,189.5313 Q191.6563,189.6875 192.2188,189.9844 L192.2188,192.7031 Q191.5938,192.125 191,191.8594 Q190.4063,191.5781 189.7813,191.5781 Q188.4375,191.5781 187.75,192.6563 Q187.0625,193.7188 187.0625,195.8125 Q187.0625,197.9063 187.75,198.9844 Q188.4375,200.0469 189.7813,200.0469 Q190.4063,200.0469 191,199.7813 Q191.5938,199.5 192.2188,198.9219 L192.2188,201.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.75" y="200.1543">D</text>
@@ -65,8 +65,8 @@
       <ellipse cx="108" cy="243.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="176" x="117" y="247.0151">dd(dependants::BB * bb) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="180" x="108" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L23" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L23" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="60.8047" id="C_0001694685540293810116" style="stroke: #A80036; stroke-width: 1.5;" width="180" x="108" y="59"/>
       <ellipse cx="189.75" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M192.7188,80.6406 Q192.1406,80.9375 191.5,81.0781 Q190.8594,81.2344 190.1563,81.2344 Q187.6563,81.2344 186.3281,79.5938 Q185.0156,77.9375 185.0156,74.8125 Q185.0156,71.6875 186.3281,70.0313 Q187.6563,68.375 190.1563,68.375 Q190.8594,68.375 191.5,68.5313 Q192.1563,68.6875 192.7188,68.9844 L192.7188,71.7031 Q192.0938,71.125 191.5,70.8594 Q190.9063,70.5781 190.2813,70.5781 Q188.9375,70.5781 188.25,71.6563 Q187.5625,72.7188 187.5625,74.8125 Q187.5625,76.9063 188.25,77.9844 Q188.9375,79.0469 190.2813,79.0469 Q190.9063,79.0469 191.5,78.7813 Q192.0938,78.5 192.7188,77.9219 L192.7188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="210.25" y="79.1543">E</text>
@@ -75,24 +75,24 @@
       <ellipse cx="119" cy="110" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="154" x="128" y="113.2104">e(dependants::D * d) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="541.5" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L32" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L32" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="48" id="C_0000736400571183204899" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="541.5" y="454.5"/>
       <ellipse cx="556.5" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M559.4688,476.1406 Q558.8906,476.4375 558.25,476.5781 Q557.6094,476.7344 556.9063,476.7344 Q554.4063,476.7344 553.0781,475.0938 Q551.7656,473.4375 551.7656,470.3125 Q551.7656,467.1875 553.0781,465.5313 Q554.4063,463.875 556.9063,463.875 Q557.6094,463.875 558.25,464.0313 Q558.9063,464.1875 559.4688,464.4844 L559.4688,467.2031 Q558.8438,466.625 558.25,466.3594 Q557.6563,466.0781 557.0313,466.0781 Q555.6875,466.0781 555,467.1563 Q554.3125,468.2188 554.3125,470.3125 Q554.3125,472.4063 555,473.4844 Q555.6875,474.5469 557.0313,474.5469 Q557.6563,474.5469 558.25,474.2813 Q558.8438,474 559.4688,473.4219 L559.4688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="570.5" y="474.6543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="542.5" x2="581.5" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="542.5" x2="581.5" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="618" y="454.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L34" target="_top" title="GG" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L34" xlink:show="new" xlink:title="GG" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="48" id="C_0001522297681294871411" style="stroke: #A80036; stroke-width: 1.5;" width="50" x="618" y="454.5"/>
       <ellipse cx="633" cy="470.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M635.9688,476.1406 Q635.3906,476.4375 634.75,476.5781 Q634.1094,476.7344 633.4063,476.7344 Q630.9063,476.7344 629.5781,475.0938 Q628.2656,473.4375 628.2656,470.3125 Q628.2656,467.1875 629.5781,465.5313 Q630.9063,463.875 633.4063,463.875 Q634.1094,463.875 634.75,464.0313 Q635.4063,464.1875 635.9688,464.4844 L635.9688,467.2031 Q635.3438,466.625 634.75,466.3594 Q634.1563,466.0781 633.5313,466.0781 Q632.1875,466.0781 631.5,467.1563 Q630.8125,468.2188 630.8125,470.3125 Q630.8125,472.4063 631.5,473.4844 Q632.1875,474.5469 633.5313,474.5469 Q634.1563,474.5469 634.75,474.2813 Q635.3438,474 635.9688,473.4219 L635.9688,476.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="18" x="647" y="474.6543">GG</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="619" x2="667" y1="486.5" y2="486.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="619" x2="667" y1="494.5" y2="494.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="495" y="314"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L36" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L36" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="73.6094" id="C_0001534191494825314170" style="stroke: #A80036; stroke-width: 1.5;" width="216" x="495" y="314"/>
       <ellipse cx="594.25" cy="330" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.2188,335.6406 Q596.6406,335.9375 596,336.0781 Q595.3594,336.2344 594.6563,336.2344 Q592.1563,336.2344 590.8281,334.5938 Q589.5156,332.9375 589.5156,329.8125 Q589.5156,326.6875 590.8281,325.0313 Q592.1563,323.375 594.6563,323.375 Q595.3594,323.375 596,323.5313 Q596.6563,323.6875 597.2188,323.9844 L597.2188,326.7031 Q596.5938,326.125 596,325.8594 Q595.4063,325.5781 594.7813,325.5781 Q593.4375,325.5781 592.75,326.6563 Q592.0625,327.7188 592.0625,329.8125 Q592.0625,331.9063 592.75,332.9844 Q593.4375,334.0469 594.7813,334.0469 Q595.4063,334.0469 596,333.7813 Q596.5938,333.5 597.2188,332.9219 L597.2188,335.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="614.75" y="334.1543">H</text>
@@ -103,8 +103,8 @@
       <ellipse cx="506" cy="377.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="190" x="515" y="381.0151">hh(dependencies::GG * gg) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="509" y="186.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L45" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L45" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="60.8047" id="C_0000097422543769740359" style="stroke: #A80036; stroke-width: 1.5;" width="188" x="509" y="186.5"/>
       <ellipse cx="597.25" cy="202.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M600.2188,208.1406 Q599.6406,208.4375 599,208.5781 Q598.3594,208.7344 597.6563,208.7344 Q595.1563,208.7344 593.8281,207.0938 Q592.5156,205.4375 592.5156,202.3125 Q592.5156,199.1875 593.8281,197.5313 Q595.1563,195.875 597.6563,195.875 Q598.3594,195.875 599,196.0313 Q599.6563,196.1875 600.2188,196.4844 L600.2188,199.2031 Q599.5938,198.625 599,198.3594 Q598.4063,198.0781 597.7813,198.0781 Q596.4375,198.0781 595.75,199.1563 Q595.0625,200.2188 595.0625,202.3125 Q595.0625,204.4063 595.75,205.4844 Q596.4375,206.5469 597.7813,206.5469 Q598.4063,206.5469 599,206.2813 Q599.5938,206 600.2188,205.4219 L600.2188,208.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="617.75" y="206.6543">I</text>
@@ -113,8 +113,8 @@
       <ellipse cx="520" cy="237.5" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="529" y="240.7104">i(dependencies::H * h) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1szndqoe5cho1)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="513.5" y="59"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L49" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00043/t00043.cc#L49" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fti7fnpz9rk1w)" height="60.8047" id="C_0001498530043106438011" style="stroke: #A80036; stroke-width: 1.5;" width="179" x="513.5" y="59"/>
       <ellipse cx="597.25" cy="75" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M600.2188,80.6406 Q599.6406,80.9375 599,81.0781 Q598.3594,81.2344 597.6563,81.2344 Q595.1563,81.2344 593.8281,79.5938 Q592.5156,77.9375 592.5156,74.8125 Q592.5156,71.6875 593.8281,70.0313 Q595.1563,68.375 597.6563,68.375 Q598.3594,68.375 599,68.5313 Q599.6563,68.6875 600.2188,68.9844 L600.2188,71.7031 Q599.5938,71.125 599,70.8594 Q598.4063,70.5781 597.7813,70.5781 Q596.4375,70.5781 595.75,71.6563 Q595.0625,72.7188 595.0625,74.8125 Q595.0625,76.9063 595.75,77.9844 Q596.4375,79.0469 597.7813,79.0469 Q598.4063,79.0469 599,78.7813 Q599.5938,78.5 600.2188,77.9219 L600.2188,80.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="617.75" y="79.1543">J</text>
diff --git a/docs/test_cases/t00044.md b/docs/test_cases/t00044.md
index 8ca9b898..37c66420 100644
--- a/docs/test_cases/t00044.md
+++ b/docs/test_cases/t00044.md
@@ -56,3 +56,160 @@ sink sink1{int_handler};
 ```
 ## Generated UML diagrams
 ![t00044_class](./t00044_class.svg "Test case for inner type aliases with parent class template args")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00044::sink<clanguml::t00044::signal_handler<,type-parameter-0-2>>",
+      "id": "1813783008369291713",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "sink",
+      "namespace": "clanguml::t00044",
+      "source_location": {
+        "file": "../../tests/t00044/t00044.cc",
+        "line": 10
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": ""
+            },
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "type-parameter-0-2"
+            }
+          ],
+          "type": "clanguml::t00044::signal_handler"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00044::signal_handler<Ret(Args...),A>",
+      "id": "1591729735727316875",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "signal_handler",
+      "namespace": "clanguml::t00044",
+      "source_location": {
+        "file": "../../tests/t00044/t00044.cc",
+        "line": 24
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "Ret(Args...)",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "A",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00044::signal_handler<T,A>",
+      "id": "276594465967577895",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "signal_handler",
+      "namespace": "clanguml::t00044",
+      "source_location": {
+        "file": "../../tests/t00044/t00044.cc",
+        "line": 7
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "A",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00044::sink<T>",
+      "id": "1759724482769288325",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "sink",
+      "namespace": "clanguml::t00044",
+      "source_location": {
+        "file": "../../tests/t00044/t00044.cc",
+        "line": 5
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00044_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1759724482769288325",
+      "source": "1813783008369291713",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "276594465967577895",
+      "source": "1591729735727316875",
+      "type": "instantiation"
+    }
+  ],
+  "using_namespace": "clanguml::t00044"
+}
+```
diff --git a/docs/test_cases/t00044_class.svg b/docs/test_cases/t00044_class.svg
index 24b17829..383fe537 100644
--- a/docs/test_cases/t00044_class.svg
+++ b/docs/test_cases/t00044_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:678px;height:175px;" version="1.1" viewBox="0 0 678 175" width="678px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1j7w0tshjurpt" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1uzkk5ncv07gx" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1j7w0tshjurpt)" height="48" id="C_0001813783008369291713" style="stroke: #A80036; stroke-width: 1.5;" width="414" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00044/t00044.cc#L10" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00044/t00044.cc#L10" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uzkk5ncv07gx)" height="48" id="C_0001813783008369291713" style="stroke: #A80036; stroke-width: 1.5;" width="414" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="35" y="28.1543">sink</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="419" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="419" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1j7w0tshjurpt)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="455.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00044/t00044.cc#L24" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00044/t00044.cc#L24" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uzkk5ncv07gx)" height="48" id="C_0001591729735727316875" style="stroke: #A80036; stroke-width: 1.5;" width="209" x="455.5" y="8"/>
       <ellipse cx="470.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M473.4688,29.6406 Q472.8906,29.9375 472.25,30.0781 Q471.6094,30.2344 470.9063,30.2344 Q468.4063,30.2344 467.0781,28.5938 Q465.7656,26.9375 465.7656,23.8125 Q465.7656,20.6875 467.0781,19.0313 Q468.4063,17.375 470.9063,17.375 Q471.6094,17.375 472.25,17.5313 Q472.9063,17.6875 473.4688,17.9844 L473.4688,20.7031 Q472.8438,20.125 472.25,19.8594 Q471.6563,19.5781 471.0313,19.5781 Q469.6875,19.5781 469,20.6563 Q468.3125,21.7188 468.3125,23.8125 Q468.3125,25.9063 469,26.9844 Q469.6875,28.0469 471.0313,28.0469 Q471.6563,28.0469 472.25,27.7813 Q472.8438,27.5 473.4688,26.9219 L473.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="484.5" y="28.1543">signal_handler</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="456.5" x2="663.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="456.5" x2="663.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00044/t00044.cc#L7" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00044/t00044.cc#L7" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1j7w0tshjurpt)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="487" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00044/t00044.cc#L7" target="_top" title="signal_handler" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00044/t00044.cc#L7" xlink:show="new" xlink:title="signal_handler" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uzkk5ncv07gx)" height="48" id="C_0000276594465967577895" style="stroke: #A80036; stroke-width: 1.5;" width="146" x="487" y="116"/>
       <ellipse cx="502" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M504.9688,137.6406 Q504.3906,137.9375 503.75,138.0781 Q503.1094,138.2344 502.4063,138.2344 Q499.9063,138.2344 498.5781,136.5938 Q497.2656,134.9375 497.2656,131.8125 Q497.2656,128.6875 498.5781,127.0313 Q499.9063,125.375 502.4063,125.375 Q503.1094,125.375 503.75,125.5313 Q504.4063,125.6875 504.9688,125.9844 L504.9688,128.7031 Q504.3438,128.125 503.75,127.8594 Q503.1563,127.5781 502.5313,127.5781 Q501.1875,127.5781 500.5,128.6563 Q499.8125,129.7188 499.8125,131.8125 Q499.8125,133.9063 500.5,134.9844 Q501.1875,136.0469 502.5313,136.0469 Q503.1563,136.0469 503.75,135.7813 Q504.3438,135.5 504.9688,134.9219 L504.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="91" x="516" y="136.1543">signal_handler</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="488" x2="632" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="488" x2="632" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00044/t00044.cc#L5" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00044/t00044.cc#L5" xlink:show="new" xlink:title="sink" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1j7w0tshjurpt)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="179" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00044/t00044.cc#L5" target="_top" title="sink" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00044/t00044.cc#L5" xlink:show="new" xlink:title="sink" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uzkk5ncv07gx)" height="48" id="C_0001759724482769288325" style="stroke: #A80036; stroke-width: 1.5;" width="68" x="179" y="116"/>
       <ellipse cx="194" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M196.9688,137.6406 Q196.3906,137.9375 195.75,138.0781 Q195.1094,138.2344 194.4063,138.2344 Q191.9063,138.2344 190.5781,136.5938 Q189.2656,134.9375 189.2656,131.8125 Q189.2656,128.6875 190.5781,127.0313 Q191.9063,125.375 194.4063,125.375 Q195.1094,125.375 195.75,125.5313 Q196.4063,125.6875 196.9688,125.9844 L196.9688,128.7031 Q196.3438,128.125 195.75,127.8594 Q195.1563,127.5781 194.5313,127.5781 Q193.1875,127.5781 192.5,128.6563 Q191.8125,129.7188 191.8125,131.8125 Q191.8125,133.9063 192.5,134.9844 Q193.1875,136.0469 194.5313,136.0469 Q195.1563,136.0469 195.75,135.7813 Q196.3438,135.5 196.9688,134.9219 L196.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="25" x="208" y="136.1543">sink</text>
diff --git a/docs/test_cases/t00045.md b/docs/test_cases/t00045.md
index b3d0c1fe..eeb254af 100644
--- a/docs/test_cases/t00045.md
+++ b/docs/test_cases/t00045.md
@@ -62,3 +62,424 @@ public:
 ```
 ## Generated UML diagrams
 ![t00045_class](./t00045_class.svg "Test case for root namespace handling")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "A",
+      "id": "864916647665253425",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 1
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "AA",
+      "id": "386872828559902182",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "AA",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 3
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "AAA",
+      "id": "54164402597771463",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "AAA",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 5
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "AAAA<T>",
+      "id": "375905626569465019",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "t",
+          "source_location": {
+            "file": "../../tests/t00045/t00045.cc",
+            "line": 8
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "AAAA",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 7
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "ns1::A",
+      "id": "619642232943663499",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "ns1",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "ns1::ns2::A",
+      "id": "2207007194029669343",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "ns1::ns2",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2207007194029669343",
+          "is_virtual": false,
+          "name": "ns1::ns2::A"
+        }
+      ],
+      "display_name": "ns1::ns2::B",
+      "id": "204051985124373077",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "ns1::ns2",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 19
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "619642232943663499",
+          "is_virtual": false,
+          "name": "ns1::A"
+        }
+      ],
+      "display_name": "ns1::ns2::C",
+      "id": "1837009554564742531",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "ns1::ns2",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 21
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "2207007194029669343",
+          "is_virtual": false,
+          "name": "ns1::ns2::A"
+        }
+      ],
+      "display_name": "ns1::ns2::D",
+      "id": "2029929560931799980",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "ns1::ns2",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 23
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "864916647665253425",
+          "is_virtual": false,
+          "name": "A"
+        }
+      ],
+      "display_name": "ns1::ns2::E",
+      "id": "2305358535757579772",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "ns1::ns2",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 25
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "ns1::ns2::AAA",
+      "id": "1731264248793686366",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "AAA",
+      "namespace": "ns1::ns2",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 27
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "ns1::ns2::R",
+      "id": "974430595320588991",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00045/t00045.cc",
+            "line": 31
+          },
+          "type": "ns1::ns2::A *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "ns1_a",
+          "source_location": {
+            "file": "../../tests/t00045/t00045.cc",
+            "line": 32
+          },
+          "type": "ns1::A *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "ns1_ns2_a",
+          "source_location": {
+            "file": "../../tests/t00045/t00045.cc",
+            "line": 33
+          },
+          "type": "ns1::ns2::A *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "root_a",
+          "source_location": {
+            "file": "../../tests/t00045/t00045.cc",
+            "line": 34
+          },
+          "type": "::A *"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [
+            {
+              "name": "aa",
+              "type": "::AA &"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "R",
+      "namespace": "ns1::ns2",
+      "source_location": {
+        "file": "../../tests/t00045/t00045.cc",
+        "line": 29
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00045_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2207007194029669343",
+      "source": "204051985124373077",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "619642232943663499",
+      "source": "1837009554564742531",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2207007194029669343",
+      "source": "2029929560931799980",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "864916647665253425",
+      "source": "2305358535757579772",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "386872828559902182",
+      "source": "974430595320588991",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2207007194029669343",
+      "label": "a",
+      "source": "974430595320588991",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "619642232943663499",
+      "label": "ns1_a",
+      "source": "974430595320588991",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "2207007194029669343",
+      "label": "ns1_ns2_a",
+      "source": "974430595320588991",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "864916647665253425",
+      "label": "root_a",
+      "source": "974430595320588991",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "54164402597771463",
+      "label": "<<friend>>",
+      "source": "974430595320588991",
+      "type": "friendship"
+    }
+  ]
+}
+```
diff --git a/docs/test_cases/t00045_class.svg b/docs/test_cases/t00045_class.svg
index a1546c15..d1c17cb5 100644
--- a/docs/test_cases/t00045_class.svg
+++ b/docs/test_cases/t00045_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="365px" preserveAspectRatio="none" style="width:670px;height:365px;" version="1.1" viewBox="0 0 670 365" width="670px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f19a5ev2vq2597" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f19b33n9muiyku" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,32 +9,32 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L1" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L1" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="37" y="197"/>
       <ellipse cx="52" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M54.9688,218.6406 Q54.3906,218.9375 53.75,219.0781 Q53.1094,219.2344 52.4063,219.2344 Q49.9063,219.2344 48.5781,217.5938 Q47.2656,215.9375 47.2656,212.8125 Q47.2656,209.6875 48.5781,208.0313 Q49.9063,206.375 52.4063,206.375 Q53.1094,206.375 53.75,206.5313 Q54.4063,206.6875 54.9688,206.9844 L54.9688,209.7031 Q54.3438,209.125 53.75,208.8594 Q53.1563,208.5781 52.5313,208.5781 Q51.1875,208.5781 50.5,209.6563 Q49.8125,210.7188 49.8125,212.8125 Q49.8125,214.9063 50.5,215.9844 Q51.1875,217.0469 52.5313,217.0469 Q53.1563,217.0469 53.75,216.7813 Q54.3438,216.5 54.9688,215.9219 L54.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="66" y="217.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="38" x2="76" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L3" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L3" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="112" y="197"/>
       <ellipse cx="127" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M129.9688,218.6406 Q129.3906,218.9375 128.75,219.0781 Q128.1094,219.2344 127.4063,219.2344 Q124.9063,219.2344 123.5781,217.5938 Q122.2656,215.9375 122.2656,212.8125 Q122.2656,209.6875 123.5781,208.0313 Q124.9063,206.375 127.4063,206.375 Q128.1094,206.375 128.75,206.5313 Q129.4063,206.6875 129.9688,206.9844 L129.9688,209.7031 Q129.3438,209.125 128.75,208.8594 Q128.1563,208.5781 127.5313,208.5781 Q126.1875,208.5781 125.5,209.6563 Q124.8125,210.7188 124.8125,212.8125 Q124.8125,214.9063 125.5,215.9844 Q126.1875,217.0469 127.5313,217.0469 Q128.1563,217.0469 128.75,216.7813 Q129.3438,216.5 129.9688,215.9219 L129.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="141" y="217.1543">AA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="113" x2="159" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L5" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L5" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0000054164402597771463" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="195" y="197"/>
       <ellipse cx="210" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M212.9688,218.6406 Q212.3906,218.9375 211.75,219.0781 Q211.1094,219.2344 210.4063,219.2344 Q207.9063,219.2344 206.5781,217.5938 Q205.2656,215.9375 205.2656,212.8125 Q205.2656,209.6875 206.5781,208.0313 Q207.9063,206.375 210.4063,206.375 Q211.1094,206.375 211.75,206.5313 Q212.4063,206.6875 212.9688,206.9844 L212.9688,209.7031 Q212.3438,209.125 211.75,208.8594 Q211.1563,208.5781 210.5313,208.5781 Q209.1875,208.5781 208.5,209.6563 Q207.8125,210.7188 207.8125,212.8125 Q207.8125,214.9063 208.5,215.9844 Q209.1875,217.0469 210.5313,217.0469 Q211.1563,217.0469 211.75,216.7813 Q212.3438,216.5 212.9688,215.9219 L212.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="24" x="224" y="217.1543">AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="196" x2="250" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L7" target="_top" title="AAAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L7" xlink:show="new" xlink:title="AAAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="60.8047" id="C_0000375905626569465019" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="394.5" y="33.5"/>
       <ellipse cx="409.5" cy="49.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M412.4688,55.1406 Q411.8906,55.4375 411.25,55.5781 Q410.6094,55.7344 409.9063,55.7344 Q407.4063,55.7344 406.0781,54.0938 Q404.7656,52.4375 404.7656,49.3125 Q404.7656,46.1875 406.0781,44.5313 Q407.4063,42.875 409.9063,42.875 Q410.6094,42.875 411.25,43.0313 Q411.9063,43.1875 412.4688,43.4844 L412.4688,46.2031 Q411.8438,45.625 411.25,45.3594 Q410.6563,45.0781 410.0313,45.0781 Q408.6875,45.0781 408,46.1563 Q407.3125,47.2188 407.3125,49.3125 Q407.3125,51.4063 408,52.4844 Q408.6875,53.5469 410.0313,53.5469 Q410.6563,53.5469 411.25,53.2813 Q411.8438,53 412.4688,52.4219 L412.4688,55.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="32" x="423.5" y="53.6543">AAAA</text>
@@ -42,103 +42,103 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="464.5" y="42.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="65.5" y2="65.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="400.5" y="71.5"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="402.5" y="73.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L8" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L8" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="23" x="414.5" y="79.7104">t : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="395.5" x2="468.5" y1="86.3047" y2="86.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="71" x="289.5" y="197"/>
       <ellipse cx="304.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M307.4688,218.6406 Q306.8906,218.9375 306.25,219.0781 Q305.6094,219.2344 304.9063,219.2344 Q302.4063,219.2344 301.0781,217.5938 Q299.7656,215.9375 299.7656,212.8125 Q299.7656,209.6875 301.0781,208.0313 Q302.4063,206.375 304.9063,206.375 Q305.6094,206.375 306.25,206.5313 Q306.9063,206.6875 307.4688,206.9844 L307.4688,209.7031 Q306.8438,209.125 306.25,208.8594 Q305.6563,208.5781 305.0313,208.5781 Q303.6875,208.5781 303,209.6563 Q302.3125,210.7188 302.3125,212.8125 Q302.3125,214.9063 303,215.9844 Q303.6875,217.0469 305.0313,217.0469 Q305.6563,217.0469 306.25,216.7813 Q306.8438,216.5 307.4688,215.9219 L307.4688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="39" x="318.5" y="217.1543">ns1::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="290.5" x2="359.5" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L17" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L17" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="423" y="197"/>
       <ellipse cx="438" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M440.9688,218.6406 Q440.3906,218.9375 439.75,219.0781 Q439.1094,219.2344 438.4063,219.2344 Q435.9063,219.2344 434.5781,217.5938 Q433.2656,215.9375 433.2656,212.8125 Q433.2656,209.6875 434.5781,208.0313 Q435.9063,206.375 438.4063,206.375 Q439.1094,206.375 439.75,206.5313 Q440.4063,206.6875 440.9688,206.9844 L440.9688,209.7031 Q440.3438,209.125 439.75,208.8594 Q439.1563,208.5781 438.5313,208.5781 Q437.1875,208.5781 436.5,209.6563 Q435.8125,210.7188 435.8125,212.8125 Q435.8125,214.9063 436.5,215.9844 Q437.1875,217.0469 438.5313,217.0469 Q439.1563,217.0469 439.75,216.7813 Q440.3438,216.5 440.9688,215.9219 L440.9688,218.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="452" y="217.1543">ns1::ns2::A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="229" y2="229"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="424" x2="524" y1="237" y2="237"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L19" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L19" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="419" y="306"/>
       <ellipse cx="434" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M436.9688,327.6406 Q436.3906,327.9375 435.75,328.0781 Q435.1094,328.2344 434.4063,328.2344 Q431.9063,328.2344 430.5781,326.5938 Q429.2656,324.9375 429.2656,321.8125 Q429.2656,318.6875 430.5781,317.0313 Q431.9063,315.375 434.4063,315.375 Q435.1094,315.375 435.75,315.5313 Q436.4063,315.6875 436.9688,315.9844 L436.9688,318.7031 Q436.3438,318.125 435.75,317.8594 Q435.1563,317.5781 434.5313,317.5781 Q433.1875,317.5781 432.5,318.6563 Q431.8125,319.7188 431.8125,321.8125 Q431.8125,323.9063 432.5,324.9844 Q433.1875,326.0469 434.5313,326.0469 Q435.1563,326.0469 435.75,325.7813 Q436.3438,325.5 436.9688,324.9219 L436.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="448" y="326.1543">ns1::ns2::B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="420" x2="520" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L21" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L21" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="274" y="306"/>
       <ellipse cx="289" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M291.9688,327.6406 Q291.3906,327.9375 290.75,328.0781 Q290.1094,328.2344 289.4063,328.2344 Q286.9063,328.2344 285.5781,326.5938 Q284.2656,324.9375 284.2656,321.8125 Q284.2656,318.6875 285.5781,317.0313 Q286.9063,315.375 289.4063,315.375 Q290.1094,315.375 290.75,315.5313 Q291.4063,315.6875 291.9688,315.9844 L291.9688,318.7031 Q291.3438,318.125 290.75,317.8594 Q290.1563,317.5781 289.5313,317.5781 Q288.1875,317.5781 287.5,318.6563 Q286.8125,319.7188 286.8125,321.8125 Q286.8125,323.9063 287.5,324.9844 Q288.1875,326.0469 289.5313,326.0469 Q290.1563,326.0469 290.75,325.7813 Q291.3438,325.5 291.9688,324.9219 L291.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="303" y="326.1543">ns1::ns2::C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="275" x2="375" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L23" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L23" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="103" x="556.5" y="306"/>
       <ellipse cx="571.5" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M574.4688,327.6406 Q573.8906,327.9375 573.25,328.0781 Q572.6094,328.2344 571.9063,328.2344 Q569.4063,328.2344 568.0781,326.5938 Q566.7656,324.9375 566.7656,321.8125 Q566.7656,318.6875 568.0781,317.0313 Q569.4063,315.375 571.9063,315.375 Q572.6094,315.375 573.25,315.5313 Q573.9063,315.6875 574.4688,315.9844 L574.4688,318.7031 Q573.8438,318.125 573.25,317.8594 Q572.6563,317.5781 572.0313,317.5781 Q570.6875,317.5781 570,318.6563 Q569.3125,319.7188 569.3125,321.8125 Q569.3125,323.9063 570,324.9844 Q570.6875,326.0469 572.0313,326.0469 Q572.6563,326.0469 573.25,325.7813 Q573.8438,325.5 574.4688,324.9219 L574.4688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="71" x="585.5" y="326.1543">ns1::ns2::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="557.5" x2="658.5" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L25" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L25" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="6" y="306"/>
       <ellipse cx="21" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,327.6406 Q23.3906,327.9375 22.75,328.0781 Q22.1094,328.2344 21.4063,328.2344 Q18.9063,328.2344 17.5781,326.5938 Q16.2656,324.9375 16.2656,321.8125 Q16.2656,318.6875 17.5781,317.0313 Q18.9063,315.375 21.4063,315.375 Q22.1094,315.375 22.75,315.5313 Q23.4063,315.6875 23.9688,315.9844 L23.9688,318.7031 Q23.3438,318.125 22.75,317.8594 Q22.1563,317.5781 21.5313,317.5781 Q20.1875,317.5781 19.5,318.6563 Q18.8125,319.7188 18.8125,321.8125 Q18.8125,323.9063 19.5,324.9844 Q20.1875,326.0469 21.5313,326.0469 Q22.1563,326.0469 22.75,325.7813 Q23.3438,325.5 23.9688,324.9219 L23.9688,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="35" y="326.1543">ns1::ns2::E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="338" y2="338"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="107" y1="346" y2="346"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L27" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L27" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="48" id="C_0001731264248793686366" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="505" y="40"/>
       <ellipse cx="520" cy="56" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M522.9688,61.6406 Q522.3906,61.9375 521.75,62.0781 Q521.1094,62.2344 520.4063,62.2344 Q517.9063,62.2344 516.5781,60.5938 Q515.2656,58.9375 515.2656,55.8125 Q515.2656,52.6875 516.5781,51.0313 Q517.9063,49.375 520.4063,49.375 Q521.1094,49.375 521.75,49.5313 Q522.4063,49.6875 522.9688,49.9844 L522.9688,52.7031 Q522.3438,52.125 521.75,51.8594 Q521.1563,51.5781 520.5313,51.5781 Q519.1875,51.5781 518.5,52.6563 Q517.8125,53.7188 517.8125,55.8125 Q517.8125,57.9063 518.5,58.9844 Q519.1875,60.0469 520.5313,60.0469 Q521.1563,60.0469 521.75,59.7813 Q522.3438,59.5 522.9688,58.9219 L522.9688,61.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="86" x="534" y="60.1543">ns1::ns2::AAA</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="72" y2="72"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="506" x2="622" y1="80" y2="80"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19a5ev2vq2597)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f19b33n9muiyku)" height="112.0234" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="174" x="185" y="8"/>
       <ellipse cx="232.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M235.7188,29.6406 Q235.1406,29.9375 234.5,30.0781 Q233.8594,30.2344 233.1563,30.2344 Q230.6563,30.2344 229.3281,28.5938 Q228.0156,26.9375 228.0156,23.8125 Q228.0156,20.6875 229.3281,19.0313 Q230.6563,17.375 233.1563,17.375 Q233.8594,17.375 234.5,17.5313 Q235.1563,17.6875 235.7188,17.9844 L235.7188,20.7031 Q235.0938,20.125 234.5,19.8594 Q233.9063,19.5781 233.2813,19.5781 Q231.9375,19.5781 231.25,20.6563 Q230.5625,21.7188 230.5625,23.8125 Q230.5625,25.9063 231.25,26.9844 Q231.9375,28.0469 233.2813,28.0469 Q233.9063,28.0469 234.5,27.7813 Q235.0938,27.5 235.7188,26.9219 L235.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="70" x="253.25" y="28.1543">ns1::ns2::R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="46"/>
       <ellipse cx="196" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L31" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L31" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="205" y="54.2104">a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="58.8047"/>
       <ellipse cx="196" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L32" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L32" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="205" y="67.0151">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="71.6094"/>
       <ellipse cx="196" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L33" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L33" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="205" y="79.8198">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="191" y="84.4141"/>
       <ellipse cx="196" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L34" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00045/t00045.cc#L34" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="205" y="92.6245">root_a : ::A *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="186" x2="358" y1="99.2188" y2="99.2188"/>
diff --git a/docs/test_cases/t00046.md b/docs/test_cases/t00046.md
index 1b531293..84d0df44 100644
--- a/docs/test_cases/t00046.md
+++ b/docs/test_cases/t00046.md
@@ -55,3 +55,368 @@ public:
 ```
 ## Generated UML diagrams
 ![t00046_class](./t00046_class.svg "Test case for root namespace handling with packages")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "display_name": "__gnu_cxx",
+      "name": "__gnu_cxx",
+      "type": "namespace"
+    },
+    {
+      "bases": [],
+      "display_name": "A",
+      "id": "864916647665253425",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00046/t00046.cc",
+        "line": 4
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "AA",
+      "id": "386872828559902182",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "AA",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00046/t00046.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "display_name": "ns1",
+      "elements": [
+        {
+          "bases": [],
+          "display_name": "ns1::A",
+          "id": "619642232943663499",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": false,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "A",
+          "namespace": "ns1",
+          "source_location": {
+            "file": "../../tests/t00046/t00046.cc",
+            "line": 10
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "display_name": "ns1::ns2",
+          "elements": [
+            {
+              "bases": [],
+              "display_name": "ns1::ns2::A",
+              "id": "2207007194029669343",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "A",
+              "namespace": "ns1::ns2",
+              "source_location": {
+                "file": "../../tests/t00046/t00046.cc",
+                "line": 14
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [
+                {
+                  "access": "public",
+                  "id": "2207007194029669343",
+                  "is_virtual": false,
+                  "name": "ns1::ns2::A"
+                }
+              ],
+              "display_name": "ns1::ns2::B",
+              "id": "204051985124373077",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "B",
+              "namespace": "ns1::ns2",
+              "source_location": {
+                "file": "../../tests/t00046/t00046.cc",
+                "line": 16
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [
+                {
+                  "access": "public",
+                  "id": "619642232943663499",
+                  "is_virtual": false,
+                  "name": "ns1::A"
+                }
+              ],
+              "display_name": "ns1::ns2::C",
+              "id": "1837009554564742531",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "C",
+              "namespace": "ns1::ns2",
+              "source_location": {
+                "file": "../../tests/t00046/t00046.cc",
+                "line": 18
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [
+                {
+                  "access": "public",
+                  "id": "2207007194029669343",
+                  "is_virtual": false,
+                  "name": "ns1::ns2::A"
+                }
+              ],
+              "display_name": "ns1::ns2::D",
+              "id": "2029929560931799980",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "D",
+              "namespace": "ns1::ns2",
+              "source_location": {
+                "file": "../../tests/t00046/t00046.cc",
+                "line": 20
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [
+                {
+                  "access": "public",
+                  "id": "864916647665253425",
+                  "is_virtual": false,
+                  "name": "A"
+                }
+              ],
+              "display_name": "ns1::ns2::E",
+              "id": "2305358535757579772",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "E",
+              "namespace": "ns1::ns2",
+              "source_location": {
+                "file": "../../tests/t00046/t00046.cc",
+                "line": 22
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [],
+              "display_name": "ns1::ns2::R",
+              "id": "974430595320588991",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": false,
+              "is_template": false,
+              "is_union": false,
+              "members": [
+                {
+                  "access": "public",
+                  "is_static": false,
+                  "name": "a",
+                  "source_location": {
+                    "file": "../../tests/t00046/t00046.cc",
+                    "line": 26
+                  },
+                  "type": "ns1::ns2::A *"
+                },
+                {
+                  "access": "public",
+                  "is_static": false,
+                  "name": "ns1_a",
+                  "source_location": {
+                    "file": "../../tests/t00046/t00046.cc",
+                    "line": 27
+                  },
+                  "type": "ns1::A *"
+                },
+                {
+                  "access": "public",
+                  "is_static": false,
+                  "name": "ns1_ns2_a",
+                  "source_location": {
+                    "file": "../../tests/t00046/t00046.cc",
+                    "line": 28
+                  },
+                  "type": "ns1::ns2::A *"
+                },
+                {
+                  "access": "public",
+                  "is_static": false,
+                  "name": "root_a",
+                  "source_location": {
+                    "file": "../../tests/t00046/t00046.cc",
+                    "line": 29
+                  },
+                  "type": "::A *"
+                },
+                {
+                  "access": "public",
+                  "is_static": false,
+                  "name": "i",
+                  "source_location": {
+                    "file": "../../tests/t00046/t00046.cc",
+                    "line": 30
+                  },
+                  "type": "std::vector<std::uint8_t>"
+                }
+              ],
+              "methods": [
+                {
+                  "access": "public",
+                  "is_const": false,
+                  "is_defaulted": false,
+                  "is_implicit": false,
+                  "is_pure_virtual": false,
+                  "is_static": false,
+                  "is_virtual": false,
+                  "name": "foo",
+                  "parameters": [
+                    {
+                      "name": "aa",
+                      "type": "::AA &"
+                    }
+                  ],
+                  "type": "void"
+                }
+              ],
+              "name": "R",
+              "namespace": "ns1::ns2",
+              "source_location": {
+                "file": "../../tests/t00046/t00046.cc",
+                "line": 24
+              },
+              "template_parameters": [],
+              "type": "class"
+            }
+          ],
+          "name": "ns2",
+          "type": "namespace"
+        }
+      ],
+      "name": "ns1",
+      "type": "namespace"
+    }
+  ],
+  "name": "t00046_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2207007194029669343",
+      "source": "204051985124373077",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "619642232943663499",
+      "source": "1837009554564742531",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "2207007194029669343",
+      "source": "2029929560931799980",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "864916647665253425",
+      "source": "2305358535757579772",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "386872828559902182",
+      "source": "974430595320588991",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2207007194029669343",
+      "label": "a",
+      "source": "974430595320588991",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "619642232943663499",
+      "label": "ns1_a",
+      "source": "974430595320588991",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "2207007194029669343",
+      "label": "ns1_ns2_a",
+      "source": "974430595320588991",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "864916647665253425",
+      "label": "root_a",
+      "source": "974430595320588991",
+      "type": "association"
+    }
+  ]
+}
+```
diff --git a/docs/test_cases/t00046_class.svg b/docs/test_cases/t00046_class.svg
index 52da4a40..2ec4900a 100644
--- a/docs/test_cases/t00046_class.svg
+++ b/docs/test_cases/t00046_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="619px" preserveAspectRatio="none" style="width:684px;height:619px;" version="1.1" viewBox="0 0 684 619" width="684px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f17738ws935oiq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fhf7tjeeswkie" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,118 +9,118 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f17738ws935oiq)" points="120,24.5,155,24.5,162,46.7969,534,46.7969,534,607,120,607,120,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhf7tjeeswkie)" points="120,24.5,155,24.5,162,46.7969,534,46.7969,534,607,120,607,120,24.5" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="120" x2="162" y1="46.7969" y2="46.7969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="124" y="39.4951">ns1</text>
-    <polygon fill="#FFFFFF" filter="url(#f17738ws935oiq)" points="144,173,179,173,186,195.2969,510,195.2969,510,583,144,583,144,173" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhf7tjeeswkie)" points="144,173,179,173,186,195.2969,510,195.2969,510,583,144,583,144,173" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="144" x2="186" y1="195.2969" y2="195.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="148" y="187.9951">ns2</text>
-    <polygon fill="#FFFFFF" filter="url(#f17738ws935oiq)" points="6,57,90,57,97,79.2969,104,79.2969,104,109.5938,6,109.5938,6,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fhf7tjeeswkie)" points="6,57,90,57,97,79.2969,104,79.2969,104,109.5938,6,109.5938,6,57" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="97" y1="79.2969" y2="79.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="78" x="10" y="71.9951">__gnu_cxx</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="206" y="59.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L10" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L10" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="48" id="C_0000619642232943663499" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="206" y="59.5"/>
       <ellipse cx="221" cy="75.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M223.9688,81.1406 Q223.3906,81.4375 222.75,81.5781 Q222.1094,81.7344 221.4063,81.7344 Q218.9063,81.7344 217.5781,80.0938 Q216.2656,78.4375 216.2656,75.3125 Q216.2656,72.1875 217.5781,70.5313 Q218.9063,68.875 221.4063,68.875 Q222.1094,68.875 222.75,69.0313 Q223.4063,69.1875 223.9688,69.4844 L223.9688,72.2031 Q223.3438,71.625 222.75,71.3594 Q222.1563,71.0781 221.5313,71.0781 Q220.1875,71.0781 219.5,72.1563 Q218.8125,73.2188 218.8125,75.3125 Q218.8125,77.4063 219.5,78.4844 Q220.1875,79.5469 221.5313,79.5469 Q222.1563,79.5469 222.75,79.2813 Q223.3438,79 223.9688,78.4219 L223.9688,81.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="235" y="79.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="207" x2="245" y1="91.5" y2="91.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="207" x2="245" y1="99.5" y2="99.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="306" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="48" id="C_0002207007194029669343" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="306" y="410"/>
       <ellipse cx="321" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M323.9688,431.6406 Q323.3906,431.9375 322.75,432.0781 Q322.1094,432.2344 321.4063,432.2344 Q318.9063,432.2344 317.5781,430.5938 Q316.2656,428.9375 316.2656,425.8125 Q316.2656,422.6875 317.5781,421.0313 Q318.9063,419.375 321.4063,419.375 Q322.1094,419.375 322.75,419.5313 Q323.4063,419.6875 323.9688,419.9844 L323.9688,422.7031 Q323.3438,422.125 322.75,421.8594 Q322.1563,421.5781 321.5313,421.5781 Q320.1875,421.5781 319.5,422.6563 Q318.8125,423.7188 318.8125,425.8125 Q318.8125,427.9063 319.5,428.9844 Q320.1875,430.0469 321.5313,430.0469 Q322.1563,430.0469 322.75,429.7813 Q323.3438,429.5 323.9688,428.9219 L323.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="335" y="430.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="307" x2="345" y1="442" y2="442"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="307" x2="345" y1="450" y2="450"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="276" y="519"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="48" id="C_0000204051985124373077" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="276" y="519"/>
       <ellipse cx="291" cy="535" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M293.9688,540.6406 Q293.3906,540.9375 292.75,541.0781 Q292.1094,541.2344 291.4063,541.2344 Q288.9063,541.2344 287.5781,539.5938 Q286.2656,537.9375 286.2656,534.8125 Q286.2656,531.6875 287.5781,530.0313 Q288.9063,528.375 291.4063,528.375 Q292.1094,528.375 292.75,528.5313 Q293.4063,528.6875 293.9688,528.9844 L293.9688,531.7031 Q293.3438,531.125 292.75,530.8594 Q292.1563,530.5781 291.5313,530.5781 Q290.1875,530.5781 289.5,531.6563 Q288.8125,532.7188 288.8125,534.8125 Q288.8125,536.9063 289.5,537.9844 Q290.1875,539.0469 291.5313,539.0469 Q292.1563,539.0469 292.75,538.7813 Q293.3438,538.5 293.9688,537.9219 L293.9688,540.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="305" y="539.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="315" y1="551" y2="551"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="277" x2="315" y1="559" y2="559"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="160" y="246.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="48" id="C_0001837009554564742531" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="160" y="246.5"/>
       <ellipse cx="175" cy="262.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M177.9688,268.1406 Q177.3906,268.4375 176.75,268.5781 Q176.1094,268.7344 175.4063,268.7344 Q172.9063,268.7344 171.5781,267.0938 Q170.2656,265.4375 170.2656,262.3125 Q170.2656,259.1875 171.5781,257.5313 Q172.9063,255.875 175.4063,255.875 Q176.1094,255.875 176.75,256.0313 Q177.4063,256.1875 177.9688,256.4844 L177.9688,259.2031 Q177.3438,258.625 176.75,258.3594 Q176.1563,258.0781 175.5313,258.0781 Q174.1875,258.0781 173.5,259.1563 Q172.8125,260.2188 172.8125,262.3125 Q172.8125,264.4063 173.5,265.4844 Q174.1875,266.5469 175.5313,266.5469 Q176.1563,266.5469 176.75,266.2813 Q177.3438,266 177.9688,265.4219 L177.9688,268.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="189" y="266.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="199" y1="278.5" y2="278.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="161" x2="199" y1="286.5" y2="286.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="351.5" y="519"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="48" id="C_0002029929560931799980" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="351.5" y="519"/>
       <ellipse cx="366.5" cy="535" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M369.4688,540.6406 Q368.8906,540.9375 368.25,541.0781 Q367.6094,541.2344 366.9063,541.2344 Q364.4063,541.2344 363.0781,539.5938 Q361.7656,537.9375 361.7656,534.8125 Q361.7656,531.6875 363.0781,530.0313 Q364.4063,528.375 366.9063,528.375 Q367.6094,528.375 368.25,528.5313 Q368.9063,528.6875 369.4688,528.9844 L369.4688,531.7031 Q368.8438,531.125 368.25,530.8594 Q367.6563,530.5781 367.0313,530.5781 Q365.6875,530.5781 365,531.6563 Q364.3125,532.7188 364.3125,534.8125 Q364.3125,536.9063 365,537.9844 Q365.6875,539.0469 367.0313,539.0469 Q367.6563,539.0469 368.25,538.7813 Q368.8438,538.5 369.4688,537.9219 L369.4688,540.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="380.5" y="539.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352.5" x2="391.5" y1="551" y2="551"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="352.5" x2="391.5" y1="559" y2="559"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="454" y="246.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L22" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L22" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="48" id="C_0002305358535757579772" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="454" y="246.5"/>
       <ellipse cx="469" cy="262.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M471.9688,268.1406 Q471.3906,268.4375 470.75,268.5781 Q470.1094,268.7344 469.4063,268.7344 Q466.9063,268.7344 465.5781,267.0938 Q464.2656,265.4375 464.2656,262.3125 Q464.2656,259.1875 465.5781,257.5313 Q466.9063,255.875 469.4063,255.875 Q470.1094,255.875 470.75,256.0313 Q471.4063,256.1875 471.9688,256.4844 L471.9688,259.2031 Q471.3438,258.625 470.75,258.3594 Q470.1563,258.0781 469.5313,258.0781 Q468.1875,258.0781 467.5,259.1563 Q466.8125,260.2188 466.8125,262.3125 Q466.8125,264.4063 467.5,265.4844 Q468.1875,266.5469 469.5313,266.5469 Q470.1563,266.5469 470.75,266.2813 Q471.3438,266 471.9688,265.4219 L471.9688,268.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="483" y="266.6543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="493" y1="278.5" y2="278.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="455" x2="493" y1="286.5" y2="286.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="235" y="208"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L24" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L24" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="124.8281" id="C_0000974430595320588991" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="235" y="208"/>
       <ellipse cx="318.75" cy="224" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M321.7188,229.6406 Q321.1406,229.9375 320.5,230.0781 Q319.8594,230.2344 319.1563,230.2344 Q316.6563,230.2344 315.3281,228.5938 Q314.0156,226.9375 314.0156,223.8125 Q314.0156,220.6875 315.3281,219.0313 Q316.6563,217.375 319.1563,217.375 Q319.8594,217.375 320.5,217.5313 Q321.1563,217.6875 321.7188,217.9844 L321.7188,220.7031 Q321.0938,220.125 320.5,219.8594 Q319.9063,219.5781 319.2813,219.5781 Q317.9375,219.5781 317.25,220.6563 Q316.5625,221.7188 316.5625,223.8125 Q316.5625,225.9063 317.25,226.9844 Q317.9375,228.0469 319.2813,228.0469 Q319.9063,228.0469 320.5,227.7813 Q321.0938,227.5 321.7188,226.9219 L321.7188,229.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="339.25" y="228.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="418" y1="240" y2="240"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="246"/>
       <ellipse cx="246" cy="251" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L26" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L26" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="94" x="255" y="254.2104">a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="258.8047"/>
       <ellipse cx="246" cy="263.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L27" target="_top" title="ns1_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L27" xlink:show="new" xlink:title="ns1_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="92" x="255" y="267.0151">ns1_a : ns1::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="271.6094"/>
       <ellipse cx="246" cy="276.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L28" target="_top" title="ns1_ns2_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L28" xlink:show="new" xlink:title="ns1_ns2_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="148" x="255" y="279.8198">ns1_ns2_a : ns1::ns2::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="284.4141"/>
       <ellipse cx="246" cy="289.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L29" target="_top" title="root_a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L29" xlink:show="new" xlink:title="root_a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="73" x="255" y="292.6245">root_a : ::A *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="241" y="297.2188"/>
       <ellipse cx="246" cy="302.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L30" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L30" xlink:show="new" xlink:title="i" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="158" x="255" y="305.4292">i : std::vector&lt;std::uint8_t&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="236" x2="418" y1="312.0234" y2="312.0234"/>
     <ellipse cx="246" cy="323.0234" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="255" y="326.2339">foo(AA &amp; aa) : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="633" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="48" id="C_0000864916647665253425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="633" y="410"/>
       <ellipse cx="648" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M650.9688,431.6406 Q650.3906,431.9375 649.75,432.0781 Q649.1094,432.2344 648.4063,432.2344 Q645.9063,432.2344 644.5781,430.5938 Q643.2656,428.9375 643.2656,425.8125 Q643.2656,422.6875 644.5781,421.0313 Q645.9063,419.375 648.4063,419.375 Q649.1094,419.375 649.75,419.5313 Q650.4063,419.6875 650.9688,419.9844 L650.9688,422.7031 Q650.3438,422.125 649.75,421.8594 Q649.1563,421.5781 648.5313,421.5781 Q647.1875,421.5781 646.5,422.6563 Q645.8125,423.7188 645.8125,425.8125 Q645.8125,427.9063 646.5,428.9844 Q647.1875,430.0469 648.5313,430.0469 Q649.1563,430.0469 649.75,429.7813 Q650.3438,429.5 650.9688,428.9219 L650.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="662" y="430.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="634" x2="672" y1="442" y2="442"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="634" x2="672" y1="450" y2="450"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f17738ws935oiq)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="550" y="410"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L6" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00046/t00046.cc#L6" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fhf7tjeeswkie)" height="48" id="C_0000386872828559902182" style="stroke: #A80036; stroke-width: 1.5;" width="48" x="550" y="410"/>
       <ellipse cx="565" cy="426" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M567.9688,431.6406 Q567.3906,431.9375 566.75,432.0781 Q566.1094,432.2344 565.4063,432.2344 Q562.9063,432.2344 561.5781,430.5938 Q560.2656,428.9375 560.2656,425.8125 Q560.2656,422.6875 561.5781,421.0313 Q562.9063,419.375 565.4063,419.375 Q566.1094,419.375 566.75,419.5313 Q567.4063,419.6875 567.9688,419.9844 L567.9688,422.7031 Q567.3438,422.125 566.75,421.8594 Q566.1563,421.5781 565.5313,421.5781 Q564.1875,421.5781 563.5,422.6563 Q562.8125,423.7188 562.8125,425.8125 Q562.8125,427.9063 563.5,428.9844 Q564.1875,430.0469 565.5313,430.0469 Q566.1563,430.0469 566.75,429.7813 Q567.3438,429.5 567.9688,428.9219 L567.9688,431.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="16" x="579" y="430.1543">AA</text>
diff --git a/docs/test_cases/t00047.md b/docs/test_cases/t00047.md
index ce7656a0..bc8b76b7 100644
--- a/docs/test_cases/t00047.md
+++ b/docs/test_cases/t00047.md
@@ -45,3 +45,165 @@ using conditional = typename conditional_t<Ts...>::type;
 ```
 ## Generated UML diagrams
 ![t00047_class](./t00047_class.svg "Test case for recursive variadic template")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00047::conditional_t<Else>",
+      "id": "47394280824625133",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "conditional_t",
+      "namespace": "clanguml::t00047",
+      "source_location": {
+        "file": "../../tests/t00047/t00047.cc",
+        "line": 8
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "Else",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00047::conditional_t<std::true_type,Result,Tail...>",
+      "id": "599782159389775809",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "conditional_t",
+      "namespace": "clanguml::t00047",
+      "source_location": {
+        "file": "../../tests/t00047/t00047.cc",
+        "line": 13
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::true_type"
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "Result",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Tail...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00047::conditional_t<std::false_type,Result,Tail...>",
+      "id": "824938194184364511",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "conditional_t",
+      "namespace": "clanguml::t00047",
+      "source_location": {
+        "file": "../../tests/t00047/t00047.cc",
+        "line": 18
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::false_type"
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "Result",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Tail...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00047::conditional_t<Ts...>",
+      "id": "1673692992642087414",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "conditional_t",
+      "namespace": "clanguml::t00047",
+      "source_location": {
+        "file": "../../tests/t00047/t00047.cc",
+        "line": 6
+      },
+      "template_parameters": [
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Ts...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00047_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1673692992642087414",
+      "source": "47394280824625133",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1673692992642087414",
+      "source": "599782159389775809",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1673692992642087414",
+      "source": "824938194184364511",
+      "type": "instantiation"
+    }
+  ],
+  "using_namespace": "clanguml::t00047"
+}
+```
diff --git a/docs/test_cases/t00047_class.svg b/docs/test_cases/t00047_class.svg
index 291ef34a..354cefea 100644
--- a/docs/test_cases/t00047_class.svg
+++ b/docs/test_cases/t00047_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="175px" preserveAspectRatio="none" style="width:799px;height:175px;" version="1.1" viewBox="0 0 799 175" width="799px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1pjh13gs2wlmm" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fvfhj9879okqg" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pjh13gs2wlmm)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00047/t00047.cc#L8" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00047/t00047.cc#L8" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvfhj9879okqg)" height="48" id="C_0000047394280824625133" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="35" y="28.1543">conditional_t</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="146" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pjh13gs2wlmm)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00047/t00047.cc#L13" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00047/t00047.cc#L13" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvfhj9879okqg)" height="48" id="C_0000599782159389775809" style="stroke: #A80036; stroke-width: 1.5;" width="282" x="182.5" y="8"/>
       <ellipse cx="197.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M200.4688,29.6406 Q199.8906,29.9375 199.25,30.0781 Q198.6094,30.2344 197.9063,30.2344 Q195.4063,30.2344 194.0781,28.5938 Q192.7656,26.9375 192.7656,23.8125 Q192.7656,20.6875 194.0781,19.0313 Q195.4063,17.375 197.9063,17.375 Q198.6094,17.375 199.25,17.5313 Q199.9063,17.6875 200.4688,17.9844 L200.4688,20.7031 Q199.8438,20.125 199.25,19.8594 Q198.6563,19.5781 198.0313,19.5781 Q196.6875,19.5781 196,20.6563 Q195.3125,21.7188 195.3125,23.8125 Q195.3125,25.9063 196,26.9844 Q196.6875,28.0469 198.0313,28.0469 Q198.6563,28.0469 199.25,27.7813 Q199.8438,27.5 200.4688,26.9219 L200.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="211.5" y="28.1543">conditional_t</text>
@@ -29,8 +29,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="183.5" x2="463.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pjh13gs2wlmm)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00047/t00047.cc#L18" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00047/t00047.cc#L18" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvfhj9879okqg)" height="48" id="C_0000824938194184364511" style="stroke: #A80036; stroke-width: 1.5;" width="285" x="500" y="8"/>
       <ellipse cx="515" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M517.9688,29.6406 Q517.3906,29.9375 516.75,30.0781 Q516.1094,30.2344 515.4063,30.2344 Q512.9063,30.2344 511.5781,28.5938 Q510.2656,26.9375 510.2656,23.8125 Q510.2656,20.6875 511.5781,19.0313 Q512.9063,17.375 515.4063,17.375 Q516.1094,17.375 516.75,17.5313 Q517.4063,17.6875 517.9688,17.9844 L517.9688,20.7031 Q517.3438,20.125 516.75,19.8594 Q516.1563,19.5781 515.5313,19.5781 Q514.1875,19.5781 513.5,20.6563 Q512.8125,21.7188 512.8125,23.8125 Q512.8125,25.9063 513.5,26.9844 Q514.1875,28.0469 515.5313,28.0469 Q516.1563,28.0469 516.75,27.7813 Q517.3438,27.5 517.9688,26.9219 L517.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="529" y="28.1543">conditional_t</text>
@@ -39,8 +39,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="501" x2="784" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1pjh13gs2wlmm)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00047/t00047.cc#L6" target="_top" title="conditional_t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00047/t00047.cc#L6" xlink:show="new" xlink:title="conditional_t" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fvfhj9879okqg)" height="48" id="C_0001673692992642087414" style="stroke: #A80036; stroke-width: 1.5;" width="141" x="253" y="116"/>
       <ellipse cx="268" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M270.9688,137.6406 Q270.3906,137.9375 269.75,138.0781 Q269.1094,138.2344 268.4063,138.2344 Q265.9063,138.2344 264.5781,136.5938 Q263.2656,134.9375 263.2656,131.8125 Q263.2656,128.6875 264.5781,127.0313 Q265.9063,125.375 268.4063,125.375 Q269.1094,125.375 269.75,125.5313 Q270.4063,125.6875 270.9688,125.9844 L270.9688,128.7031 Q270.3438,128.125 269.75,127.8594 Q269.1563,127.5781 268.5313,127.5781 Q267.1875,127.5781 266.5,128.6563 Q265.8125,129.7188 265.8125,131.8125 Q265.8125,133.9063 266.5,134.9844 Q267.1875,136.0469 268.5313,136.0469 Q269.1563,136.0469 269.75,135.7813 Q270.3438,135.5 270.9688,134.9219 L270.9688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="80" x="282" y="136.1543">conditional_t</text>
diff --git a/docs/test_cases/t00048.md b/docs/test_cases/t00048.md
index 9a78f499..d8c4cfbe 100644
--- a/docs/test_cases/t00048.md
+++ b/docs/test_cases/t00048.md
@@ -122,3 +122,352 @@ template <typename T> struct BaseTemplate {
 ```
 ## Generated UML diagrams
 ![t00048_class](./t00048_class.svg "Test case for unique entity id with multiple translation units")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00048::Base",
+      "id": "10200626899013233",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "base",
+          "source_location": {
+            "file": "../../tests/t00048/t00048.h",
+            "line": 7
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "Base",
+      "namespace": "clanguml::t00048",
+      "source_location": {
+        "file": "../../tests/t00048/t00048.h",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00048::BaseTemplate<T>",
+      "id": "630197772543569536",
+      "is_abstract": true,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "base",
+          "source_location": {
+            "file": "../../tests/t00048/t00048.h",
+            "line": 13
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": true,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "BaseTemplate",
+      "namespace": "clanguml::t00048",
+      "source_location": {
+        "file": "../../tests/t00048/t00048.h",
+        "line": 12
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "10200626899013233",
+          "is_virtual": false,
+          "name": "clanguml::t00048::Base"
+        }
+      ],
+      "display_name": "clanguml::t00048::B",
+      "id": "59336049758992190",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00048/b_t00048.h",
+            "line": 9
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "B",
+      "namespace": "clanguml::t00048",
+      "source_location": {
+        "file": "../../tests/t00048/b_t00048.h",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "630197772543569536",
+          "is_virtual": false,
+          "name": "BaseTemplate<T>"
+        }
+      ],
+      "display_name": "clanguml::t00048::BTemplate<T>",
+      "id": "1635850649347735305",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00048/b_t00048.h",
+            "line": 15
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "BTemplate",
+      "namespace": "clanguml::t00048",
+      "source_location": {
+        "file": "../../tests/t00048/b_t00048.h",
+        "line": 14
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "10200626899013233",
+          "is_virtual": false,
+          "name": "clanguml::t00048::Base"
+        }
+      ],
+      "display_name": "clanguml::t00048::A",
+      "id": "199333691834211223",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00048/a_t00048.h",
+            "line": 9
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": true,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00048",
+      "source_location": {
+        "file": "../../tests/t00048/a_t00048.h",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "630197772543569536",
+          "is_virtual": false,
+          "name": "BaseTemplate<T>"
+        }
+      ],
+      "display_name": "clanguml::t00048::ATemplate<T>",
+      "id": "1025697108404463905",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00048/a_t00048.h",
+            "line": 15
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "foo",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "ATemplate",
+      "namespace": "clanguml::t00048",
+      "source_location": {
+        "file": "../../tests/t00048/a_t00048.h",
+        "line": 14
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00048_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "10200626899013233",
+      "source": "59336049758992190",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "630197772543569536",
+      "source": "1635850649347735305",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "10200626899013233",
+      "source": "199333691834211223",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "630197772543569536",
+      "source": "1025697108404463905",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00048"
+}
+```
diff --git a/docs/test_cases/t00048_class.svg b/docs/test_cases/t00048_class.svg
index 48029937..e8b4fca0 100644
--- a/docs/test_cases/t00048_class.svg
+++ b/docs/test_cases/t00048_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="226px" preserveAspectRatio="none" style="width:529px;height:226px;" version="1.1" viewBox="0 0 529 226" width="529px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fnb3ely2npiv4" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ln3dtyahbfuy" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnb3ely2npiv4)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L6" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L6" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ln3dtyahbfuy)" height="73.6094" id="C_0000010200626899013233" style="stroke: #A80036; stroke-width: 1.5;" width="112" x="81.5" y="8"/>
       <ellipse cx="119" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M119.1094,19.3438 L117.9531,24.4219 L120.2813,24.4219 L119.1094,19.3438 Z M117.625,17.1094 L120.6094,17.1094 L123.9688,29.5 L121.5156,29.5 L120.75,26.4375 L117.4688,26.4375 L116.7188,29.5 L114.2813,29.5 L117.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="30" x="138" y="28.1543">Base</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="87.5" y="46"/>
       <ellipse cx="92.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L7" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L7" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="101.5" y="54.2104">base : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="192.5" y1="60.8047" y2="60.8047"/>
     <ellipse cx="92.5" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="101.5" y="75.0151">foo() = 0 : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnb3ely2npiv4)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L12" target="_top" title="BaseTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L12" xlink:show="new" xlink:title="BaseTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ln3dtyahbfuy)" height="73.6094" id="C_0000630197772543569536" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="284" y="8"/>
       <ellipse cx="299" cy="24" fill="#A9DCDF" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M299.1094,19.3438 L297.9531,24.4219 L300.2813,24.4219 L299.1094,19.3438 Z M297.625,17.1094 L300.6094,17.1094 L303.9688,29.5 L301.5156,29.5 L300.75,26.4375 L297.4688,26.4375 L296.7188,29.5 L294.2813,29.5 L297.625,17.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="88" x="313" y="28.1543">BaseTemplate</text>
@@ -35,35 +35,35 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="410" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="290" y="46"/>
       <ellipse cx="295" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L13" target="_top" title="base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/t00048.h#L13" xlink:show="new" xlink:title="base" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="304" y="54.2104">base : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="285" x2="414" y1="60.8047" y2="60.8047"/>
     <ellipse cx="295" cy="71.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="86" x="304" y="75.0151">foo() = 0 : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnb3ely2npiv4)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ln3dtyahbfuy)" height="73.6094" id="C_0000059336049758992190" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="6" y="142"/>
       <ellipse cx="42.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M45.1188,163.6406 Q44.5406,163.9375 43.9,164.0781 Q43.2594,164.2344 42.5563,164.2344 Q40.0563,164.2344 38.7281,162.5938 Q37.4156,160.9375 37.4156,157.8125 Q37.4156,154.6875 38.7281,153.0313 Q40.0563,151.375 42.5563,151.375 Q43.2594,151.375 43.9,151.5313 Q44.5563,151.6875 45.1188,151.9844 L45.1188,154.7031 Q44.4938,154.125 43.9,153.8594 Q43.3063,153.5781 42.6813,153.5781 Q41.3375,153.5781 40.65,154.6563 Q39.9625,155.7188 39.9625,157.8125 Q39.9625,159.9063 40.65,160.9844 Q41.3375,162.0469 42.6813,162.0469 Q43.3063,162.0469 43.9,161.7813 Q44.4938,161.5 45.1188,160.9219 L45.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="60.85" y="162.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="180"/>
       <ellipse cx="17" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L9" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L9" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="26" y="188.2104">b : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="92" y1="194.8047" y2="194.8047"/>
     <ellipse cx="17" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="26" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnb3ely2npiv4)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L14" target="_top" title="BTemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L14" xlink:show="new" xlink:title="BTemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ln3dtyahbfuy)" height="73.6094" id="C_0001635850649347735305" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="262" y="142"/>
       <ellipse cx="277" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M279.9688,163.6406 Q279.3906,163.9375 278.75,164.0781 Q278.1094,164.2344 277.4063,164.2344 Q274.9063,164.2344 273.5781,162.5938 Q272.2656,160.9375 272.2656,157.8125 Q272.2656,154.6875 273.5781,153.0313 Q274.9063,151.375 277.4063,151.375 Q278.1094,151.375 278.75,151.5313 Q279.4063,151.6875 279.9688,151.9844 L279.9688,154.7031 Q279.3438,154.125 278.75,153.8594 Q278.1563,153.5781 277.5313,153.5781 Q276.1875,153.5781 275.5,154.6563 Q274.8125,155.7188 274.8125,157.8125 Q274.8125,159.9063 275.5,160.9844 Q276.1875,162.0469 277.5313,162.0469 Q278.1563,162.0469 278.75,161.7813 Q279.3438,161.5 279.9688,160.9219 L279.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="291" y="162.1543">BTemplate</text>
@@ -71,35 +71,35 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="366" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="268" y="180"/>
       <ellipse cx="273" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L15" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/b_t00048.h#L15" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="282" y="188.2104">b : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="263" x2="370" y1="194.8047" y2="194.8047"/>
     <ellipse cx="273" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="282" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnb3ely2npiv4)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ln3dtyahbfuy)" height="73.6094" id="C_0000199333691834211223" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="128" y="142"/>
       <ellipse cx="164.15" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M167.1188,163.6406 Q166.5406,163.9375 165.9,164.0781 Q165.2594,164.2344 164.5563,164.2344 Q162.0563,164.2344 160.7281,162.5938 Q159.4156,160.9375 159.4156,157.8125 Q159.4156,154.6875 160.7281,153.0313 Q162.0563,151.375 164.5563,151.375 Q165.2594,151.375 165.9,151.5313 Q166.5563,151.6875 167.1188,151.9844 L167.1188,154.7031 Q166.4938,154.125 165.9,153.8594 Q165.3063,153.5781 164.6813,153.5781 Q163.3375,153.5781 162.65,154.6563 Q161.9625,155.7188 161.9625,157.8125 Q161.9625,159.9063 162.65,160.9844 Q163.3375,162.0469 164.6813,162.0469 Q165.3063,162.0469 165.9,161.7813 Q166.4938,161.5 167.1188,160.9219 L167.1188,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="182.85" y="162.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="134" y="180"/>
       <ellipse cx="139" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L9" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L9" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="148" y="188.2104">a : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="214" y1="194.8047" y2="194.8047"/>
     <ellipse cx="139" cy="205.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="61" x="148" y="209.0151">foo() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fnb3ely2npiv4)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L14" target="_top" title="ATemplate" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L14" xlink:show="new" xlink:title="ATemplate" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ln3dtyahbfuy)" height="73.6094" id="C_0001025697108404463905" style="stroke: #A80036; stroke-width: 1.5;" width="109" x="406" y="142"/>
       <ellipse cx="421" cy="158" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M423.9688,163.6406 Q423.3906,163.9375 422.75,164.0781 Q422.1094,164.2344 421.4063,164.2344 Q418.9063,164.2344 417.5781,162.5938 Q416.2656,160.9375 416.2656,157.8125 Q416.2656,154.6875 417.5781,153.0313 Q418.9063,151.375 421.4063,151.375 Q422.1094,151.375 422.75,151.5313 Q423.4063,151.6875 423.9688,151.9844 L423.9688,154.7031 Q423.3438,154.125 422.75,153.8594 Q422.1563,153.5781 421.5313,153.5781 Q420.1875,153.5781 419.5,154.6563 Q418.8125,155.7188 418.8125,157.8125 Q418.8125,159.9063 419.5,160.9844 Q420.1875,162.0469 421.5313,162.0469 Q422.1563,162.0469 422.75,161.7813 Q423.3438,161.5 423.9688,160.9219 L423.9688,163.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="66" x="435" y="162.1543">ATemplate</text>
@@ -107,11 +107,11 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="510" y="151.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="174" y2="174"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="412" y="180"/>
       <ellipse cx="417" cy="185" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L15" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00048/a_t00048.h#L15" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="426" y="188.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="407" x2="514" y1="194.8047" y2="194.8047"/>
diff --git a/docs/test_cases/t00049.md b/docs/test_cases/t00049.md
index ba4bfbe2..2b2ffc70 100644
--- a/docs/test_cases/t00049.md
+++ b/docs/test_cases/t00049.md
@@ -48,3 +48,261 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00049_class](./t00049_class.svg "Test case configurable type aliases")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00049::A<T>",
+      "id": "372971769516871577",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00049/t00049.cc",
+            "line": 8
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_a",
+          "parameters": [],
+          "type": "T &"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00049",
+      "source_location": {
+        "file": "../../tests/t00049/t00049.cc",
+        "line": 7
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00049::A<intmap>",
+      "id": "654829353386288443",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00049",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "intmap"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00049::A<thestring>",
+      "id": "973058255816844469",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00049",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "thestring"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00049::A<string_vector>",
+      "id": "562074851310302010",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00049",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "string_vector"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00049::R",
+      "id": "2288024073053091226",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a_string",
+          "source_location": {
+            "file": "../../tests/t00049/t00049.cc",
+            "line": 14
+          },
+          "type": "A<std::basic_string<char>>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a_vector_string",
+          "source_location": {
+            "file": "../../tests/t00049/t00049.cc",
+            "line": 15
+          },
+          "type": "A<std::vector<std::string>>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a_int_map",
+          "source_location": {
+            "file": "../../tests/t00049/t00049.cc",
+            "line": 16
+          },
+          "type": "A<std::map<int,int>>"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_int_map",
+          "parameters": [],
+          "type": "clanguml::t00049::A<std::map<int,int>>"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "set_int_map",
+          "parameters": [
+            {
+              "name": "int_map",
+              "type": "clanguml::t00049::A<std::map<int,int>> &&"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "R",
+      "namespace": "clanguml::t00049",
+      "source_location": {
+        "file": "../../tests/t00049/t00049.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00049_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "372971769516871577",
+      "source": "654829353386288443",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "372971769516871577",
+      "source": "973058255816844469",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "372971769516871577",
+      "source": "562074851310302010",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "654829353386288443",
+      "source": "2288024073053091226",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "973058255816844469",
+      "label": "a_string",
+      "source": "2288024073053091226",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "562074851310302010",
+      "label": "a_vector_string",
+      "source": "2288024073053091226",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "654829353386288443",
+      "label": "a_int_map",
+      "source": "2288024073053091226",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00049"
+}
+```
diff --git a/docs/test_cases/t00049_class.svg b/docs/test_cases/t00049_class.svg
index 92482219..1f800654 100644
--- a/docs/test_cases/t00049_class.svg
+++ b/docs/test_cases/t00049_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:416px;height:390px;" version="1.1" viewBox="0 0 416 390" width="416px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fqo0wsei70nqr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f11ne7kwjvxrrj" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqo0wsei70nqr)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="144.5" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11ne7kwjvxrrj)" height="73.6094" id="C_0000372971769516871577" style="stroke: #A80036; stroke-width: 1.5;" width="98" x="144.5" y="306"/>
       <ellipse cx="180.65" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M183.6188,327.6406 Q183.0406,327.9375 182.4,328.0781 Q181.7594,328.2344 181.0563,328.2344 Q178.5563,328.2344 177.2281,326.5938 Q175.9156,324.9375 175.9156,321.8125 Q175.9156,318.6875 177.2281,317.0313 Q178.5563,315.375 181.0563,315.375 Q181.7594,315.375 182.4,315.5313 Q183.0563,315.6875 183.6188,315.9844 L183.6188,318.7031 Q182.9938,318.125 182.4,317.8594 Q181.8063,317.5781 181.1813,317.5781 Q179.8375,317.5781 179.15,318.6563 Q178.4625,319.7188 178.4625,321.8125 Q178.4625,323.9063 179.15,324.9844 Q179.8375,326.0469 181.1813,326.0469 Q181.8063,326.0469 182.4,325.7813 Q182.9938,325.5 183.6188,324.9219 L183.6188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="199.35" y="326.1543">A</text>
@@ -18,17 +18,17 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="237.5" y="315.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="241.5" y1="338" y2="338"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="150.5" y="344"/>
       <ellipse cx="155.5" cy="349" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L8" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L8" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="164.5" y="352.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="145.5" x2="241.5" y1="358.8047" y2="358.8047"/>
     <ellipse cx="155.5" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="164.5" y="373.0151">get_a() : T &amp;</text>
-    <rect fill="#FEFECE" filter="url(#fqo0wsei70nqr)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="21" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f11ne7kwjvxrrj)" height="48" id="C_0000654829353386288443" style="stroke: #A80036; stroke-width: 1.5;" width="87" x="21" y="197"/>
     <ellipse cx="36" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M38.9688,218.6406 Q38.3906,218.9375 37.75,219.0781 Q37.1094,219.2344 36.4063,219.2344 Q33.9063,219.2344 32.5781,217.5938 Q31.2656,215.9375 31.2656,212.8125 Q31.2656,209.6875 32.5781,208.0313 Q33.9063,206.375 36.4063,206.375 Q37.1094,206.375 37.75,206.5313 Q38.4063,206.6875 38.9688,206.9844 L38.9688,209.7031 Q38.3438,209.125 37.75,208.8594 Q37.1563,208.5781 36.5313,208.5781 Q35.1875,208.5781 34.5,209.6563 Q33.8125,210.7188 33.8125,212.8125 Q33.8125,214.9063 34.5,215.9844 Q35.1875,217.0469 36.5313,217.0469 Q37.1563,217.0469 37.75,216.7813 Q38.3438,216.5 38.9688,215.9219 L38.9688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="50" y="217.1543">A</text>
@@ -36,7 +36,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="43" x="67" y="206.1387">intmap</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22" x2="107" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="22" x2="107" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fqo0wsei70nqr)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="143.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f11ne7kwjvxrrj)" height="48" id="C_0000973058255816844469" style="stroke: #A80036; stroke-width: 1.5;" width="100" x="143.5" y="197"/>
     <ellipse cx="158.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M161.4688,218.6406 Q160.8906,218.9375 160.25,219.0781 Q159.6094,219.2344 158.9063,219.2344 Q156.4063,219.2344 155.0781,217.5938 Q153.7656,215.9375 153.7656,212.8125 Q153.7656,209.6875 155.0781,208.0313 Q156.4063,206.375 158.9063,206.375 Q159.6094,206.375 160.25,206.5313 Q160.9063,206.6875 161.4688,206.9844 L161.4688,209.7031 Q160.8438,209.125 160.25,208.8594 Q159.6563,208.5781 159.0313,208.5781 Q157.6875,208.5781 157,209.6563 Q156.3125,210.7188 156.3125,212.8125 Q156.3125,214.9063 157,215.9844 Q157.6875,217.0469 159.0313,217.0469 Q159.6563,217.0469 160.25,216.7813 Q160.8438,216.5 161.4688,215.9219 L161.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="172.5" y="217.1543">A</text>
@@ -44,7 +44,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="56" x="189.5" y="206.1387">thestring</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="144.5" x2="242.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="144.5" x2="242.5" y1="237" y2="237"/>
-    <rect fill="#FEFECE" filter="url(#fqo0wsei70nqr)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="278.5" y="197"/>
+    <rect fill="#FEFECE" filter="url(#f11ne7kwjvxrrj)" height="48" id="C_0000562074851310302010" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="278.5" y="197"/>
     <ellipse cx="293.5" cy="213" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M296.4688,218.6406 Q295.8906,218.9375 295.25,219.0781 Q294.6094,219.2344 293.9063,219.2344 Q291.4063,219.2344 290.0781,217.5938 Q288.7656,215.9375 288.7656,212.8125 Q288.7656,209.6875 290.0781,208.0313 Q291.4063,206.375 293.9063,206.375 Q294.6094,206.375 295.25,206.5313 Q295.9063,206.6875 296.4688,206.9844 L296.4688,209.7031 Q295.8438,209.125 295.25,208.8594 Q294.6563,208.5781 294.0313,208.5781 Q292.6875,208.5781 292,209.6563 Q291.3125,210.7188 291.3125,212.8125 Q291.3125,214.9063 292,215.9844 Q292.6875,217.0469 294.0313,217.0469 Q294.6563,217.0469 295.25,216.7813 Q295.8438,216.5 296.4688,215.9219 L296.4688,218.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="307.5" y="217.1543">A</text>
@@ -52,32 +52,32 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="80" x="324.5" y="206.1387">string_vector</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="279.5" x2="401.5" y1="229" y2="229"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="279.5" x2="401.5" y1="237" y2="237"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fqo0wsei70nqr)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L13" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L13" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f11ne7kwjvxrrj)" height="112.0234" id="C_0002288024073053091226" style="stroke: #A80036; stroke-width: 1.5;" width="275" x="6" y="8"/>
       <ellipse cx="135.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M138.2188,29.6406 Q137.6406,29.9375 137,30.0781 Q136.3594,30.2344 135.6563,30.2344 Q133.1563,30.2344 131.8281,28.5938 Q130.5156,26.9375 130.5156,23.8125 Q130.5156,20.6875 131.8281,19.0313 Q133.1563,17.375 135.6563,17.375 Q136.3594,17.375 137,17.5313 Q137.6563,17.6875 138.2188,17.9844 L138.2188,20.7031 Q137.5938,20.125 137,19.8594 Q136.4063,19.5781 135.7813,19.5781 Q134.4375,19.5781 133.75,20.6563 Q133.0625,21.7188 133.0625,23.8125 Q133.0625,25.9063 133.75,26.9844 Q134.4375,28.0469 135.7813,28.0469 Q136.4063,28.0469 137,27.7813 Q137.5938,27.5 138.2188,26.9219 L138.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="155.75" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="280" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L14" target="_top" title="a_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L14" xlink:show="new" xlink:title="a_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="26" y="54.2104">a_string : A&lt;thestring&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <ellipse cx="17" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L15" target="_top" title="a_vector_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L15" xlink:show="new" xlink:title="a_vector_string" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="198" x="26" y="67.0151">a_vector_string : A&lt;string_vector&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="71.6094"/>
       <ellipse cx="17" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L16" target="_top" title="a_int_map" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00049/t00049.cc#L16" xlink:show="new" xlink:title="a_int_map" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="134" x="26" y="79.8198">a_int_map : A&lt;intmap&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="280" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00050.md b/docs/test_cases/t00050.md
index 7110fa96..046d4a41 100644
--- a/docs/test_cases/t00050.md
+++ b/docs/test_cases/t00050.md
@@ -182,3 +182,309 @@ class NoComment { };
 ```
 ## Generated UML diagrams
 ![t00050_class](./t00050_class.svg "Test case for generating notes from comments using jinja templates")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "Lorem ipsum dolor sit",
+        "paragraph": [
+          " Lorem ipsum dolor sit\n"
+        ],
+        "raw": "/// Lorem ipsum dolor sit",
+        "text": "\n Lorem ipsum dolor sit\n"
+      },
+      "display_name": "clanguml::t00050::A",
+      "id": "1885563213397742674",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00050",
+      "source_location": {
+        "file": "../../tests/t00050/t00050.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "brief": [
+          " Lorem ipsum\n"
+        ],
+        "formatted": "\n \\brief Lorem ipsum\n\n Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n\n \\todo 1. Write meaningful comment\n \\todo 2. Write tests\n \\todo 3. Implement\n ",
+        "paragraph": [
+          " \n",
+          " Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n",
+          " \n"
+        ],
+        "raw": "/**\n * \\brief Lorem ipsum\n *\n * Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n * vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n * Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n * integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n * tellus ligula porttitor metus.\n *\n * \\todo 1. Write meaningful comment\n * \\todo 2. Write tests\n * \\todo 3. Implement\n */",
+        "text": "\n \n\n Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n\n \n",
+        "todo": [
+          " 1. Write meaningful comment\n \n",
+          " 2. Write tests\n \n",
+          " 3. Implement\n"
+        ]
+      },
+      "display_name": "clanguml::t00050::B",
+      "id": "500262098409836244",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00050",
+      "source_location": {
+        "file": "../../tests/t00050/t00050.cc",
+        "line": 24
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "brief": [
+          " Long comment example\n"
+        ],
+        "formatted": "\\brief Long comment example\n\nLorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\nvehicula class ultricies mollis dictumst, aenean non a in donec nulla.\nPhasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\ninteger placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\ntellus ligula porttitor metus.\n\nVivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\neuismod libero facilisi aptent elementum felis blandit cursus gravida sociis\nerat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\nad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\nligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\nvolutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\nconubia mauris tempor, etiam ultricies proin quisque lectus sociis id\ntristique, integer phasellus taciti pretium adipiscing tortor sagittis\nligula.\n\nMollis pretium lorem primis senectus habitasse lectus scelerisque\ndonec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\npellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\nlacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\ntaciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\nest, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\nimperdiet praesent magnis ridiculus congue gravida curabitur dictum\nsagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\naenean vel nostra tellus commodo pretium sapien sociosqu.",
+        "paragraph": [
+          " \n",
+          " Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n",
+          " Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\n ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\n volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\n conubia mauris tempor, etiam ultricies proin quisque lectus sociis id\n tristique, integer phasellus taciti pretium adipiscing tortor sagittis\n ligula.\n",
+          " Mollis pretium lorem primis senectus habitasse lectus scelerisque\n donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\n pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\n lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\n taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\n est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\n imperdiet praesent magnis ridiculus congue gravida curabitur dictum\n sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\n aenean vel nostra tellus commodo pretium sapien sociosqu.\n"
+        ],
+        "raw": "/// \\brief Long comment example\n///\n/// Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n/// vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n/// Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n/// integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n/// tellus ligula porttitor metus.\n///\n/// Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n/// euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n/// erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n/// ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\n/// ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\n/// volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\n/// conubia mauris tempor, etiam ultricies proin quisque lectus sociis id\n/// tristique, integer phasellus taciti pretium adipiscing tortor sagittis\n/// ligula.\n///\n/// Mollis pretium lorem primis senectus habitasse lectus scelerisque\n/// donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\n/// pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\n/// lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\n/// taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\n/// est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\n/// imperdiet praesent magnis ridiculus congue gravida curabitur dictum\n/// sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\n/// aenean vel nostra tellus commodo pretium sapien sociosqu.",
+        "text": "\n \n\n Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n\n Vivamus integer non suscipit taciti mus etiam at primis tempor sagittis sit,\n euismod libero facilisi aptent elementum felis blandit cursus gravida sociis\n erat ante, eleifend lectus nullam dapibus netus feugiat curae curabitur est\n ad. Massa curae fringilla porttitor quam sollicitudin iaculis aptent leo\n ligula euismod dictumst, orci penatibus mauris eros etiam praesent erat\n volutpat posuere hac. Metus fringilla nec ullamcorper odio aliquam lacinia\n conubia mauris tempor, etiam ultricies proin quisque lectus sociis id\n tristique, integer phasellus taciti pretium adipiscing tortor sagittis\n ligula.\n\n Mollis pretium lorem primis senectus habitasse lectus scelerisque\n donec, ultricies tortor suspendisse adipiscing fusce morbi volutpat\n pellentesque, consectetur mi risus molestie curae malesuada cum. Dignissim\n lacus convallis massa mauris enim ad mattis magnis senectus montes, mollis\n taciti phasellus accumsan bibendum semper blandit suspendisse faucibus nibh\n est, metus lobortis morbi cras magna vivamus per risus fermentum. Dapibus\n imperdiet praesent magnis ridiculus congue gravida curabitur dictum\n sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,\n aenean vel nostra tellus commodo pretium sapien sociosqu.\n"
+      },
+      "display_name": "clanguml::t00050::C",
+      "id": "1663081653671078922",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00050",
+      "source_location": {
+        "file": "../../tests/t00050/t00050.cc",
+        "line": 53
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\nvehicula class ultricies mollis dictumst, aenean non a in donec nulla.\nPhasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\ninteger placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\ntellus ligula porttitor metus.\n\n\\todo Implement...",
+        "paragraph": [
+          " Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n",
+          " \n"
+        ],
+        "raw": "/// Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n/// vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n/// Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n/// integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n/// tellus ligula porttitor metus.\n///\n/// \\todo Implement...",
+        "text": "\n Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis\n vehicula class ultricies mollis dictumst, aenean non a in donec nulla.\n Phasellus ante pellentesque erat cum risus consequat imperdiet aliquam,\n integer placerat et turpis mi eros nec lobortis taciti, vehicula nisl litora\n tellus ligula porttitor metus.\n\n \n",
+        "todo": [
+          " Implement...\n"
+        ]
+      },
+      "display_name": "clanguml::t00050::utils::D",
+      "id": "1492514566602019299",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00050::utils",
+      "source_location": {
+        "file": "../../tests/t00050/t00050.cc",
+        "line": 65
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "comment": {
+        "formatted": "Mollis pretium lorem primis",
+        "paragraph": [
+          " Mollis pretium lorem primis\n"
+        ],
+        "raw": "/// Mollis pretium lorem primis",
+        "text": "\n Mollis pretium lorem primis\n"
+      },
+      "constants": [
+        "E1",
+        "E2",
+        "E3"
+      ],
+      "display_name": "clanguml::t00050::E",
+      "id": "2027344031570117998",
+      "is_nested": false,
+      "name": "E",
+      "namespace": "clanguml::t00050",
+      "source_location": {
+        "file": "../../tests/t00050/t00050.cc",
+        "line": 70
+      },
+      "type": "enum"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "brief": [
+          " Simple array wrapper.\n"
+        ],
+        "formatted": "\\brief Simple array wrapper.\n\nThis class is just for testing tparam parsing, it serves no other\npurpose.\n\n\\tparam T Type of array elements.\n\\tparam V Type of regular element.\n\\tparam N Size of T array.",
+        "paragraph": [
+          " \n",
+          " This class is just for testing tparam parsing, it serves no other\n purpose.\n",
+          " \n"
+        ],
+        "raw": "/// \\brief Simple array wrapper.\n///\n/// This class is just for testing tparam parsing, it serves no other\n/// purpose.\n///\n/// \\tparam T Type of array elements.\n/// \\tparam V Type of regular element.\n/// \\tparam N Size of T array.\n///",
+        "text": "\n \n\n This class is just for testing tparam parsing, it serves no other\n purpose.\n\n \n",
+        "tparam": [
+          {
+            "description": " Type of array elements.\n \n",
+            "name": "T"
+          },
+          {
+            "description": " Type of regular element.\n \n",
+            "name": "V"
+          },
+          {
+            "description": " Size of T array.\n",
+            "name": "N"
+          }
+        ]
+      },
+      "display_name": "clanguml::t00050::F<T,V,int N>",
+      "id": "793698410848959592",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "t",
+          "source_location": {
+            "file": "../../tests/t00050/t00050.cc",
+            "line": 82
+          },
+          "type": "T[N]"
+        },
+        {
+          "access": "private",
+          "is_static": false,
+          "name": "v",
+          "source_location": {
+            "file": "../../tests/t00050/t00050.cc",
+            "line": 83
+          },
+          "type": "V"
+        }
+      ],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00050",
+      "source_location": {
+        "file": "../../tests/t00050/t00050.cc",
+        "line": 81
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "V",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "non_type_template",
+          "name": "N",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "comment": {
+        "formatted": "This is a short description of class G.\n\nThis is an intermediate description of class G.\n\nThis is a long description of class G.",
+        "paragraph": [
+          " This is a short description of class G.\n",
+          " This is an intermediate description of class G.\n",
+          " This is a long description of class G.\n"
+        ],
+        "raw": "/// This is a short description of class G.\n///\n/// This is an intermediate description of class G.\n///\n/// This is a long description of class G.",
+        "text": "\n This is a short description of class G.\n\n This is an intermediate description of class G.\n\n This is a long description of class G.\n"
+      },
+      "display_name": "clanguml::t00050::G",
+      "id": "449485154531299941",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00050",
+      "source_location": {
+        "file": "../../tests/t00050/t00050.cc",
+        "line": 91
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00050::NoComment",
+      "id": "1832693799357996932",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "NoComment",
+      "namespace": "clanguml::t00050",
+      "source_location": {
+        "file": "../../tests/t00050/t00050.cc",
+        "line": 93
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00050_class",
+  "relationships": [],
+  "using_namespace": "clanguml::t00050"
+}
+```
diff --git a/docs/test_cases/t00050_class.svg b/docs/test_cases/t00050_class.svg
index ff20ac50..1941b0b9 100644
--- a/docs/test_cases/t00050_class.svg
+++ b/docs/test_cases/t00050_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="684px" preserveAspectRatio="none" style="width:2480px;height:684px;" version="1.1" viewBox="0 0 2480 684" width="2480px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f19kd5cl0vykbh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1qasexfqzyldf" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19kd5cl0vykbh)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qasexfqzyldf)" height="48" id="C_0001885563213397742674" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="201" y="49.5"/>
       <ellipse cx="216" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M218.9688,71.1406 Q218.3906,71.4375 217.75,71.5781 Q217.1094,71.7344 216.4063,71.7344 Q213.9063,71.7344 212.5781,70.0938 Q211.2656,68.4375 211.2656,65.3125 Q211.2656,62.1875 212.5781,60.5313 Q213.9063,58.875 216.4063,58.875 Q217.1094,58.875 217.75,59.0313 Q218.4063,59.1875 218.9688,59.4844 L218.9688,62.2031 Q218.3438,61.625 217.75,61.3594 Q217.1563,61.0781 216.5313,61.0781 Q215.1875,61.0781 214.5,62.1563 Q213.8125,63.2188 213.8125,65.3125 Q213.8125,67.4063 214.5,68.4844 Q215.1875,69.5469 216.5313,69.5469 Q217.1563,69.5469 217.75,69.2813 Q218.3438,69 218.9688,68.4219 L218.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="230" y="69.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="202" x2="240" y1="89.5" y2="89.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19kd5cl0vykbh)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L24" target="_top" title="Lorem ipsum" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L24" xlink:show="new" xlink:title="Lorem ipsum" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qasexfqzyldf)" height="48" id="C_0000500262098409836244" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1344" y="369"/>
       <ellipse cx="1359" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1361.9688,390.6406 Q1361.3906,390.9375 1360.75,391.0781 Q1360.1094,391.2344 1359.4063,391.2344 Q1356.9063,391.2344 1355.5781,389.5938 Q1354.2656,387.9375 1354.2656,384.8125 Q1354.2656,381.6875 1355.5781,380.0313 Q1356.9063,378.375 1359.4063,378.375 Q1360.1094,378.375 1360.75,378.5313 Q1361.4063,378.6875 1361.9688,378.9844 L1361.9688,381.7031 Q1361.3438,381.125 1360.75,380.8594 Q1360.1563,380.5781 1359.5313,380.5781 Q1358.1875,380.5781 1357.5,381.6563 Q1356.8125,382.7188 1356.8125,384.8125 Q1356.8125,386.9063 1357.5,387.9844 Q1358.1875,389.0469 1359.5313,389.0469 Q1360.1563,389.0469 1360.75,388.7813 Q1361.3438,388.5 1361.9688,387.9219 L1361.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1373" y="389.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1345" x2="1383" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19kd5cl0vykbh)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L53" target="_top" title="Long comment example" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L53" xlink:show="new" xlink:title="Long comment example" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qasexfqzyldf)" height="48" id="C_0001663081653671078922" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="580" y="369"/>
       <ellipse cx="595" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M597.9688,390.6406 Q597.3906,390.9375 596.75,391.0781 Q596.1094,391.2344 595.4063,391.2344 Q592.9063,391.2344 591.5781,389.5938 Q590.2656,387.9375 590.2656,384.8125 Q590.2656,381.6875 591.5781,380.0313 Q592.9063,378.375 595.4063,378.375 Q596.1094,378.375 596.75,378.5313 Q597.4063,378.6875 597.9688,378.9844 L597.9688,381.7031 Q597.3438,381.125 596.75,380.8594 Q596.1563,380.5781 595.5313,380.5781 Q594.1875,380.5781 593.5,381.6563 Q592.8125,382.7188 592.8125,384.8125 Q592.8125,386.9063 593.5,387.9844 Q594.1875,389.0469 595.5313,389.0469 Q596.1563,389.0469 596.75,388.7813 Q597.3438,388.5 597.9688,387.9219 L597.9688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="609" y="389.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="581" x2="619" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19kd5cl0vykbh)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L65" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L65" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qasexfqzyldf)" height="48" id="C_0001492514566602019299" style="stroke: #A80036; stroke-width: 1.5;" width="75" x="1706.5" y="369"/>
       <ellipse cx="1721.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1724.4688,390.6406 Q1723.8906,390.9375 1723.25,391.0781 Q1722.6094,391.2344 1721.9063,391.2344 Q1719.4063,391.2344 1718.0781,389.5938 Q1716.7656,387.9375 1716.7656,384.8125 Q1716.7656,381.6875 1718.0781,380.0313 Q1719.4063,378.375 1721.9063,378.375 Q1722.6094,378.375 1723.25,378.5313 Q1723.9063,378.6875 1724.4688,378.9844 L1724.4688,381.7031 Q1723.8438,381.125 1723.25,380.8594 Q1722.6563,380.5781 1722.0313,380.5781 Q1720.6875,380.5781 1720,381.6563 Q1719.3125,382.7188 1719.3125,384.8125 Q1719.3125,386.9063 1720,387.9844 Q1720.6875,389.0469 1722.0313,389.0469 Q1722.6563,389.0469 1723.25,388.7813 Q1723.8438,388.5 1724.4688,387.9219 L1724.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="43" x="1735.5" y="389.1543">utils::D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1707.5" x2="1780.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19kd5cl0vykbh)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L70" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L70" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qasexfqzyldf)" height="86.4141" id="C_0002027344031570117998" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1832" y="30.5"/>
       <ellipse cx="1847" cy="46.5" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1851.1094,52.5 L1843.3906,52.5 L1843.3906,40.1094 L1851.1094,40.1094 L1851.1094,42.2656 L1845.8438,42.2656 L1845.8438,44.9375 L1850.6094,44.9375 L1850.6094,47.0938 L1845.8438,47.0938 L1845.8438,50.3438 L1851.1094,50.3438 L1851.1094,52.5 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1861" y="50.6543">E</text>
@@ -52,8 +52,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="14" x="1838" y="102.3198">E3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1833" x2="1871" y1="108.9141" y2="108.9141"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19kd5cl0vykbh)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L81" target="_top" title="Simple array wrapper." xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L81" xlink:show="new" xlink:title="Simple array wrapper." xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qasexfqzyldf)" height="73.6094" id="C_0000793698410848959592" style="stroke: #A80036; stroke-width: 1.5;" width="95" x="2053.5" y="356"/>
       <ellipse cx="2068.5" cy="372" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2071.4688,377.6406 Q2070.8906,377.9375 2070.25,378.0781 Q2069.6094,378.2344 2068.9063,378.2344 Q2066.4063,378.2344 2065.0781,376.5938 Q2063.7656,374.9375 2063.7656,371.8125 Q2063.7656,368.6875 2065.0781,367.0313 Q2066.4063,365.375 2068.9063,365.375 Q2069.6094,365.375 2070.25,365.5313 Q2070.9063,365.6875 2071.4688,365.9844 L2071.4688,368.7031 Q2070.8438,368.125 2070.25,367.8594 Q2069.6563,367.5781 2069.0313,367.5781 Q2067.6875,367.5781 2067,368.6563 Q2066.3125,369.7188 2066.3125,371.8125 Q2066.3125,373.9063 2067,374.9844 Q2067.6875,376.0469 2069.0313,376.0469 Q2069.6563,376.0469 2070.25,375.7813 Q2070.8438,375.5 2071.4688,374.9219 L2071.4688,377.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="2082.5" y="376.1543">F</text>
@@ -61,44 +61,44 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="52" x="2098.5" y="365.1387">T,V,int N</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="388" y2="388"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="394"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="396"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L82" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L82" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="2073.5" y="402.2104">t : T[N]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="2059.5" y="406.8047"/>
       <rect fill="none" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="2061.5" y="408.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L83" target="_top" title="v" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L83" xlink:show="new" xlink:title="v" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="2073.5" y="415.0151">v : V</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="2054.5" x2="2147.5" y1="421.6094" y2="421.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19kd5cl0vykbh)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L91" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L91" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qasexfqzyldf)" height="48" id="C_0000449485154531299941" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="829.5" y="369"/>
       <ellipse cx="844.5" cy="385" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M847.4688,390.6406 Q846.8906,390.9375 846.25,391.0781 Q845.6094,391.2344 844.9063,391.2344 Q842.4063,391.2344 841.0781,389.5938 Q839.7656,387.9375 839.7656,384.8125 Q839.7656,381.6875 841.0781,380.0313 Q842.4063,378.375 844.9063,378.375 Q845.6094,378.375 846.25,378.5313 Q846.9063,378.6875 847.4688,378.9844 L847.4688,381.7031 Q846.8438,381.125 846.25,380.8594 Q845.6563,380.5781 845.0313,380.5781 Q843.6875,380.5781 843,381.6563 Q842.3125,382.7188 842.3125,384.8125 Q842.3125,386.9063 843,387.9844 Q843.6875,389.0469 845.0313,389.0469 Q845.6563,389.0469 846.25,388.7813 Q846.8438,388.5 847.4688,387.9219 L847.4688,390.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="858.5" y="389.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="401" y2="401"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="830.5" x2="869.5" y1="409" y2="409"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f19kd5cl0vykbh)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L93" target="_top" title="NoComment" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00050/t00050.cc#L93" xlink:show="new" xlink:title="NoComment" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qasexfqzyldf)" height="48" id="C_0001832693799357996932" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="2361" y="49.5"/>
       <ellipse cx="2376" cy="65.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M2378.9688,71.1406 Q2378.3906,71.4375 2377.75,71.5781 Q2377.1094,71.7344 2376.4063,71.7344 Q2373.9063,71.7344 2372.5781,70.0938 Q2371.2656,68.4375 2371.2656,65.3125 Q2371.2656,62.1875 2372.5781,60.5313 Q2373.9063,58.875 2376.4063,58.875 Q2377.1094,58.875 2377.75,59.0313 Q2378.4063,59.1875 2378.9688,59.4844 L2378.9688,62.2031 Q2378.3438,61.625 2377.75,61.3594 Q2377.1563,61.0781 2376.5313,61.0781 Q2375.1875,61.0781 2374.5,62.1563 Q2373.8125,63.2188 2373.8125,65.3125 Q2373.8125,67.4063 2374.5,68.4844 Q2375.1875,69.5469 2376.5313,69.5469 Q2377.1563,69.5469 2377.75,69.2813 Q2378.3438,69 2378.9688,68.4219 L2378.9688,71.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="2390" y="69.6543">NoComment</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="81.5" y2="81.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="2362" x2="2468" y1="89.5" y2="89.5"/>
     </a>
-    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,61 L6,86.1328 A0,0 0 0 0 6,86.1328 L166,86.1328 A0,0 0 0 0 166,86.1328 L166,79 L200.86,73.5 L166,71 L166,71 L156,61 L6,61 A0,0 0 0 0 6,61 " fill="#FBFB77" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M156,61 L156,71 L166,71 L156,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="12" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M276,61 L276,69.5 L241.28,73.5 L276,77.5 L276,86.1328 A0,0 0 0 0 276,86.1328 L476,86.1328 A0,0 0 0 0 476,86.1328 L476,71 L466,61 L276,61 A0,0 0 0 0 276,61 " fill="#FBFB77" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M466,61 L466,71 L476,71 L466,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="139" x="282" y="78.0669">Lorem ipsum dolor sit</text>
-    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M19.5,199 L19.5,587.3203 A0,0 0 0 0 19.5,587.3203 L544.5,587.3203 A0,0 0 0 0 544.5,587.3203 L544.5,397 L579.7,393 L544.5,389 L544.5,209 L534.5,199 L19.5,199 A0,0 0 0 0 19.5,199 " fill="#AABBCC" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M534.5,199 L534.5,209 L544.5,209 L534.5,199 " fill="#AABBCC" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="484" x="33.5" y="216.0669">Lorem ipsum dolor sit amet consectetur adipiscing elit, urna consequat felis</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="434" x="25.5" y="231.1997">vehicula class ultricies mollis dictumst, aenean non a in donec nulla.</text>
@@ -125,50 +125,50 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="440" x="25.5" y="548.9888">imperdiet praesent magnis ridiculus congue gravida curabitur dictum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="453" x="25.5" y="564.1216">sagittis, enim et magna sit inceptos sodales parturient pharetra mollis,</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="386" x="25.5" y="579.2544">aenean vel nostra tellus commodo pretium sapien sociosqu.</text>
-    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M723.5,61 L723.5,86.1328 A0,0 0 0 0 723.5,86.1328 L846,86.1328 L850,368.69 L854,86.1328 L976.5,86.1328 A0,0 0 0 0 976.5,86.1328 L976.5,71 L966.5,61 L723.5,61 A0,0 0 0 0 723.5,61 " fill="#FBFB77" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M966.5,61 L966.5,71 L976.5,71 L966.5,61 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="232" x="729.5" y="78.0669">This is a short description of class G.</text>
-    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M906,380.5 L906,389 L870.61,393 L906,397 L906,405.6328 A0,0 0 0 0 906,405.6328 L1216,405.6328 A0,0 0 0 0 1216,405.6328 L1216,390.5 L1206,380.5 L906,380.5 A0,0 0 0 0 906,380.5 " fill="#FBFB77" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1206,380.5 L1206,390.5 L1216,390.5 L1206,380.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="289" x="912" y="397.5669">This is an intermediate description of class G.</text>
-    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M726.5,647 L726.5,672.1328 A0,0 0 0 0 726.5,672.1328 L973.5,672.1328 A0,0 0 0 0 973.5,672.1328 L973.5,657 L963.5,647 L854,647 L850,417.01 L846,647 L726.5,647 A0,0 0 0 0 726.5,647 " fill="#FBFB77" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M963.5,647 L963.5,657 L973.5,657 L963.5,647 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="226" x="732.5" y="664.0669">This is a long description of class G.</text>
-    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1011.5,53.5 L1011.5,93.7656 L1116.5,93.7656 L1116.5,63.5 L1106.5,53.5 L1011.5,53.5 " fill="#22AA22" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1106.5,53.5 L1106.5,63.5 L1116.5,63.5 L1106.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1017.5" y="70.5669">Lorem ipsum</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1021.5" y="85.6997"/>
-    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1152,38 L1152,108.5313 A0,0 0 0 0 1152,108.5313 L1266.44,108.5313 L1356.27,368.62 L1274.44,108.5313 L1366,108.5313 A0,0 0 0 0 1366,108.5313 L1366,48 L1356,38 L1152,38 A0,0 0 0 0 1152,38 " fill="#882222" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1356,38 L1356,48 L1366,48 L1356,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1158" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="189" x="1162" y="70.1997">1. Write meaningful comment</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1162" y="100.4653"/>
-    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1401.5,38 L1401.5,108.5313 A0,0 0 0 0 1401.5,108.5313 L1441.98,108.5313 L1370.77,368.62 L1449.98,108.5313 L1510.5,108.5313 A0,0 0 0 0 1510.5,108.5313 L1510.5,48 L1500.5,38 L1401.5,38 A0,0 0 0 0 1401.5,38 " fill="#882222" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1500.5,38 L1500.5,48 L1510.5,48 L1500.5,38 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1407.5" y="55.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="84" x="1411.5" y="70.1997">2. Write tests</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="85.3325"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1411.5" y="100.4653"/>
-    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1546,46 L1546,101.3984 A0,0 0 0 0 1546,101.3984 L1577.2,101.3984 L1381.31,368.81 L1585.2,101.3984 L1656,101.3984 A0,0 0 0 0 1656,101.3984 L1656,56 L1646,46 L1546,46 A0,0 0 0 0 1546,46 " fill="#882222" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1646,46 L1646,56 L1656,56 L1646,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1552" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="1556" y="78.1997">3. Implement</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1556" y="93.3325"/>
-    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M511.5,53.5 L511.5,93.7656 A0,0 0 0 0 511.5,93.7656 L596,93.7656 L600,368.67 L604,93.7656 L688.5,93.7656 A0,0 0 0 0 688.5,93.7656 L688.5,63.5 L678.5,53.5 L511.5,53.5 A0,0 0 0 0 511.5,53.5 " fill="#22AA22" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M678.5,53.5 L678.5,63.5 L688.5,63.5 L678.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="156" x="517.5" y="70.5669">Long comment example</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="521.5" y="85.6997"/>
-    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1691,46 L1691,101.3984 A0,0 0 0 0 1691,101.3984 L1740,101.3984 L1744,368.81 L1748,101.3984 L1797,101.3984 A0,0 0 0 0 1797,101.3984 L1797,56 L1787,46 L1691,46 A0,0 0 0 0 1691,46 " fill="#882222" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M1787,46 L1787,56 L1797,56 L1787,46 " fill="#882222" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="41" x="1697" y="63.0669">TODO</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="81" x="1701" y="78.1997">Implement...</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1701" y="93.3325"/>
-    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M1907.5,53.5 L1907.5,93.7656 A0,0 0 0 0 1907.5,93.7656 L1990.9,93.7656 L2088.15,355.9 L1998.9,93.7656 L2068.5,93.7656 A0,0 0 0 0 2068.5,93.7656 L2068.5,63.5 L2058.5,53.5 L1907.5,53.5 A0,0 0 0 0 1907.5,53.5 " fill="#22AA22" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2058.5,53.5 L2058.5,63.5 L2068.5,63.5 L2058.5,53.5 " fill="#22AA22" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="140" x="1913.5" y="70.5669">Simple array wrapper.</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="1917.5" y="85.6997"/>
-    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#f19kd5cl0vykbh)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M2104,8 L2104,139.0625 A0,0 0 0 0 2104,139.0625 L2187.79,139.0625 L2114.06,355.63 L2195.79,139.0625 L2326,139.0625 A0,0 0 0 0 2326,139.0625 L2326,18 L2316,8 L2104,8 A0,0 0 0 0 2104,8 " fill="#AAAAFF" filter="url(#f1qasexfqzyldf)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M2316,8 L2316,18 L2326,18 L2316,8 " fill="#AAAAFF" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="160" x="2110" y="25.0669">Template parameters</text>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="0" x="2114" y="40.1997"/>
diff --git a/docs/test_cases/t00051.md b/docs/test_cases/t00051.md
index cb6b1e66..27937a57 100644
--- a/docs/test_cases/t00051.md
+++ b/docs/test_cases/t00051.md
@@ -84,3 +84,374 @@ A::custom_thread2 A::start_thread2()
 ```
 ## Generated UML diagrams
 ![t00051_class](./t00051_class.svg "Test case for relative paths in lambda names")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [
+        {
+          "access": "private",
+          "id": "1911564114172366679",
+          "is_virtual": false,
+          "name": "std::thread"
+        }
+      ],
+      "display_name": "clanguml::t00051::B<F,FF=F>",
+      "id": "486675674447050206",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f_",
+          "source_location": {
+            "file": "../../tests/t00051/t00051.cc",
+            "line": 16
+          },
+          "type": "F"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "ff_",
+          "source_location": {
+            "file": "../../tests/t00051/t00051.cc",
+            "line": 17
+          },
+          "type": "FF"
+        }
+      ],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "B<F, FF>",
+          "parameters": [
+            {
+              "name": "f",
+              "type": "F &&"
+            },
+            {
+              "name": "ff",
+              "type": "FF &&"
+            }
+          ],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "f",
+          "parameters": [],
+          "type": "void"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "ff",
+          "parameters": [],
+          "type": "void"
+        }
+      ],
+      "name": "B",
+      "namespace": "clanguml::t00051",
+      "source_location": {
+        "file": "../../tests/t00051/t00051.cc",
+        "line": 6
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "F",
+          "template_parameters": []
+        },
+        {
+          "default": "F",
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "FF",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "private",
+          "id": "1911564114172366679",
+          "is_virtual": false,
+          "name": "std::thread"
+        }
+      ],
+      "display_name": "clanguml::t00051::B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)>",
+      "id": "129489662928342298",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00051",
+      "source_location": {
+        "file": "../../tests/t00051/t00051.cc",
+        "line": 6
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "(lambda at ../../tests/t00051/t00051.cc:43:18)"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "(lambda at ../../tests/t00051/t00051.cc:43:27)"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00051::A",
+      "id": "1064663612772326174",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": true,
+          "is_virtual": false,
+          "name": "start_thread1",
+          "parameters": [],
+          "type": "clanguml::t00051::A::custom_thread1"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": true,
+          "is_virtual": false,
+          "name": "start_thread2",
+          "parameters": [],
+          "type": "clanguml::t00051::A::custom_thread2"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "start_thread3",
+          "parameters": [],
+          "type": "clanguml::t00051::B<(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)>"
+        },
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_function",
+          "parameters": [],
+          "type": "(lambda at ../../tests/t00051/t00051.cc:48:16)"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00051",
+      "source_location": {
+        "file": "../../tests/t00051/t00051.cc",
+        "line": 20
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "private",
+          "id": "1911564114172366679",
+          "is_virtual": false,
+          "name": "std::thread"
+        }
+      ],
+      "display_name": "clanguml::t00051::A::custom_thread1",
+      "id": "267762118222214764",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "custom_thread1",
+          "parameters": [
+            {
+              "name": "f",
+              "type": "Function &&"
+            },
+            {
+              "name": "args",
+              "type": "Args &&..."
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "A::custom_thread1",
+      "namespace": "clanguml::t00051",
+      "source_location": {
+        "file": "../../tests/t00051/t00051.cc",
+        "line": 23
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "private",
+          "id": "1911564114172366679",
+          "is_virtual": false,
+          "name": "std::thread"
+        }
+      ],
+      "display_name": "clanguml::t00051::A::custom_thread2",
+      "id": "728501319748477470",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "thread",
+          "parameters": [
+            {
+              "name": "",
+              "type": "(lambda at ../../tests/t00051/t00051.cc:59:27) &&"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "A::custom_thread2",
+      "namespace": "clanguml::t00051",
+      "source_location": {
+        "file": "../../tests/t00051/t00051.cc",
+        "line": 35
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00051_class",
+  "relationships": [
+    {
+      "access": "private",
+      "destination": "1911564114172366679",
+      "source": "486675674447050206",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "486675674447050206",
+      "source": "129489662928342298",
+      "type": "instantiation"
+    },
+    {
+      "access": "private",
+      "destination": "1911564114172366679",
+      "source": "129489662928342298",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "129489662928342298",
+      "source": "1064663612772326174",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1064663612772326174",
+      "source": "267762118222214764",
+      "type": "containment"
+    },
+    {
+      "access": "private",
+      "destination": "1911564114172366679",
+      "source": "267762118222214764",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1064663612772326174",
+      "source": "728501319748477470",
+      "type": "containment"
+    },
+    {
+      "access": "private",
+      "destination": "1911564114172366679",
+      "source": "728501319748477470",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00051"
+}
+```
diff --git a/docs/test_cases/t00051_class.svg b/docs/test_cases/t00051_class.svg
index df0ab88a..ce6fa271 100644
--- a/docs/test_cases/t00051_class.svg
+++ b/docs/test_cases/t00051_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="519px" preserveAspectRatio="none" style="width:893px;height:519px;" version="1.1" viewBox="0 0 893 519" width="893px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1my5birwa4t98" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f6wl30xh95whn" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my5birwa4t98)" height="112.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="215" x="350" y="396"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6wl30xh95whn)" height="112.0234" id="C_0000486675674447050206" style="stroke: #A80036; stroke-width: 1.5;" width="215" x="350" y="396"/>
       <ellipse cx="426.25" cy="412" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M429.2188,417.6406 Q428.6406,417.9375 428,418.0781 Q427.3594,418.2344 426.6563,418.2344 Q424.1563,418.2344 422.8281,416.5938 Q421.5156,414.9375 421.5156,411.8125 Q421.5156,408.6875 422.8281,407.0313 Q424.1563,405.375 426.6563,405.375 Q427.3594,405.375 428,405.5313 Q428.6563,405.6875 429.2188,405.9844 L429.2188,408.7031 Q428.5938,408.125 428,407.8594 Q427.4063,407.5781 426.7813,407.5781 Q425.4375,407.5781 424.75,408.6563 Q424.0625,409.7188 424.0625,411.8125 Q424.0625,413.9063 424.75,414.9844 Q425.4375,416.0469 426.7813,416.0469 Q427.4063,416.0469 428,415.7813 Q428.5938,415.5 429.2188,414.9219 L429.2188,417.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="446.75" y="416.1543">B</text>
@@ -18,18 +18,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="42" x="525" y="405.1387">F,FF=F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="351" x2="564" y1="428" y2="428"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="356" y="434"/>
       <ellipse cx="361" cy="439" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L16" target="_top" title="f_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L16" xlink:show="new" xlink:title="f_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="28" x="370" y="442.2104">f_ : F</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="356" y="446.8047"/>
       <ellipse cx="361" cy="451.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L17" target="_top" title="ff_" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L17" xlink:show="new" xlink:title="ff_" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="38" x="370" y="455.0151">ff_ : FF</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="351" x2="564" y1="461.6094" y2="461.6094"/>
@@ -39,16 +39,16 @@
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="47" x="370" y="488.6245">f() : void</text>
     <ellipse cx="361" cy="498.2188" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="370" y="501.4292">ff() : void</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my5birwa4t98)" height="48" id="C_0000129489662928342298" style="stroke: #A80036; stroke-width: 1.5;" width="642" x="136.5" y="288"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L6" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L6" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6wl30xh95whn)" height="48" id="C_0000129489662928342298" style="stroke: #A80036; stroke-width: 1.5;" width="642" x="136.5" y="288"/>
       <ellipse cx="151.5" cy="304" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M154.4688,309.6406 Q153.8906,309.9375 153.25,310.0781 Q152.6094,310.2344 151.9063,310.2344 Q149.4063,310.2344 148.0781,308.5938 Q146.7656,306.9375 146.7656,303.8125 Q146.7656,300.6875 148.0781,299.0313 Q149.4063,297.375 151.9063,297.375 Q152.6094,297.375 153.25,297.5313 Q153.9063,297.6875 154.4688,297.9844 L154.4688,300.7031 Q153.8438,300.125 153.25,299.8594 Q152.6563,299.5781 152.0313,299.5781 Q150.6875,299.5781 150,300.6563 Q149.3125,301.7188 149.3125,303.8125 Q149.3125,305.9063 150,306.9844 Q150.6875,308.0469 152.0313,308.0469 Q152.6563,308.0469 153.25,307.7813 Q153.8438,307.5 154.4688,306.9219 L154.4688,309.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="610" x="165.5" y="308.1543">B&lt;(lambda at ../../tests/t00051/t00051.cc:43:18),(lambda at ../../tests/t00051/t00051.cc:43:27)&gt;</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="777.5" y1="320" y2="320"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137.5" x2="777.5" y1="328" y2="328"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my5birwa4t98)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="121" y="129"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L20" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L20" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6wl30xh95whn)" height="99.2188" id="C_0001064663612772326174" style="stroke: #A80036; stroke-width: 1.5;" width="673" x="121" y="129"/>
       <ellipse cx="449.25" cy="145" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M452.2188,150.6406 Q451.6406,150.9375 451,151.0781 Q450.3594,151.2344 449.6563,151.2344 Q447.1563,151.2344 445.8281,149.5938 Q444.5156,147.9375 444.5156,144.8125 Q444.5156,141.6875 445.8281,140.0313 Q447.1563,138.375 449.6563,138.375 Q450.3594,138.375 451,138.5313 Q451.6563,138.6875 452.2188,138.9844 L452.2188,141.7031 Q451.5938,141.125 451,140.8594 Q450.4063,140.5781 449.7813,140.5781 Q448.4375,140.5781 447.75,141.6563 Q447.0625,142.7188 447.0625,144.8125 Q447.0625,146.9063 447.75,147.9844 Q448.4375,149.0469 449.7813,149.0469 Q450.4063,149.0469 451,148.7813 Q451.5938,148.5 452.2188,147.9219 L452.2188,150.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="469.75" y="149.1543">A</text>
@@ -63,8 +63,8 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="129" y="215.4141"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="349" x="141" y="221.6245">get_function() : (lambda at ../../tests/t00051/t00051.cc:48:16)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my5birwa4t98)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="447" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L23" target="_top" title="A##custom_thread1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L23" xlink:show="new" xlink:title="A##custom_thread1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6wl30xh95whn)" height="60.8047" id="C_0000267762118222214764" style="stroke: #A80036; stroke-width: 1.5;" width="447" x="6" y="8"/>
       <ellipse cx="166.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M169.2188,29.6406 Q168.6406,29.9375 168,30.0781 Q167.3594,30.2344 166.6563,30.2344 Q164.1563,30.2344 162.8281,28.5938 Q161.5156,26.9375 161.5156,23.8125 Q161.5156,20.6875 162.8281,19.0313 Q164.1563,17.375 166.6563,17.375 Q167.3594,17.375 168,17.5313 Q168.6563,17.6875 169.2188,17.9844 L169.2188,20.7031 Q168.5938,20.125 168,19.8594 Q167.4063,19.5781 166.7813,19.5781 Q165.4375,19.5781 164.75,20.6563 Q164.0625,21.7188 164.0625,23.8125 Q164.0625,25.9063 164.75,26.9844 Q165.4375,28.0469 166.7813,28.0469 Q167.4063,28.0469 168,27.7813 Q168.5938,27.5 169.2188,26.9219 L169.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="186.75" y="28.1543">A::custom_thread1</text>
@@ -73,8 +73,8 @@
       <ellipse cx="17" cy="59" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="421" x="26" y="62.2104">custom_thread1&lt;Function,Args...&gt;(Function &amp;&amp; f, Args &amp;&amp;... args) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1my5birwa4t98)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="394" x="488.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L35" target="_top" title="A##custom_thread2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00051/t00051.cc#L35" xlink:show="new" xlink:title="A##custom_thread2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f6wl30xh95whn)" height="60.8047" id="C_0000728501319748477470" style="stroke: #A80036; stroke-width: 1.5;" width="394" x="488.5" y="8"/>
       <ellipse cx="622.25" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M625.2188,29.6406 Q624.6406,29.9375 624,30.0781 Q623.3594,30.2344 622.6563,30.2344 Q620.1563,30.2344 618.8281,28.5938 Q617.5156,26.9375 617.5156,23.8125 Q617.5156,20.6875 618.8281,19.0313 Q620.1563,17.375 622.6563,17.375 Q623.3594,17.375 624,17.5313 Q624.6563,17.6875 625.2188,17.9844 L625.2188,20.7031 Q624.5938,20.125 624,19.8594 Q623.4063,19.5781 622.7813,19.5781 Q621.4375,19.5781 620.75,20.6563 Q620.0625,21.7188 620.0625,23.8125 Q620.0625,25.9063 620.75,26.9844 Q621.4375,28.0469 622.7813,28.0469 Q623.4063,28.0469 624,27.7813 Q624.5938,27.5 625.2188,26.9219 L625.2188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="118" x="642.75" y="28.1543">A::custom_thread2</text>
diff --git a/docs/test_cases/t00052.md b/docs/test_cases/t00052.md
index 206f049e..e4edb209 100644
--- a/docs/test_cases/t00052.md
+++ b/docs/test_cases/t00052.md
@@ -55,3 +55,315 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00052_class](./t00052_class.svg "Test case for template methods rendering")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00052::A",
+      "id": "2200853067459698271",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "a",
+          "parameters": [
+            {
+              "name": "p",
+              "type": "T"
+            }
+          ],
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "aa",
+          "parameters": [
+            {
+              "name": "f",
+              "type": "F &&"
+            },
+            {
+              "name": "q",
+              "type": "Q"
+            }
+          ],
+          "type": "void"
+        }
+      ],
+      "name": "A",
+      "namespace": "clanguml::t00052",
+      "source_location": {
+        "file": "../../tests/t00052/t00052.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00052::B<T>",
+      "id": "1737293776724790064",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "b",
+          "parameters": [
+            {
+              "name": "t",
+              "type": "T"
+            }
+          ],
+          "type": "T"
+        },
+        {
+          "access": "public",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "bb",
+          "parameters": [
+            {
+              "name": "f",
+              "type": "F &&"
+            },
+            {
+              "name": "t",
+              "type": "T"
+            }
+          ],
+          "type": "T"
+        }
+      ],
+      "name": "B",
+      "namespace": "clanguml::t00052",
+      "source_location": {
+        "file": "../../tests/t00052/t00052.cc",
+        "line": 13
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00052::C<T>",
+      "id": "687756639884832524",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "private",
+          "is_const": false,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "c",
+          "parameters": [
+            {
+              "name": "p",
+              "type": "P"
+            }
+          ],
+          "type": "T"
+        }
+      ],
+      "name": "C",
+      "namespace": "clanguml::t00052",
+      "source_location": {
+        "file": "../../tests/t00052/t00052.cc",
+        "line": 20
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00052::B<int>",
+      "id": "1043027222809675776",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00052",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00052::C<int>",
+      "id": "492968837554438176",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00052",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00052::R",
+      "id": "1157978668683299226",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00052/t00052.cc",
+            "line": 30
+          },
+          "type": "clanguml::t00052::A"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00052/t00052.cc",
+            "line": 31
+          },
+          "type": "B<int>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00052/t00052.cc",
+            "line": 32
+          },
+          "type": "C<int>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00052",
+      "source_location": {
+        "file": "../../tests/t00052/t00052.cc",
+        "line": 29
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00052_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1737293776724790064",
+      "source": "1043027222809675776",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "687756639884832524",
+      "source": "492968837554438176",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "2200853067459698271",
+      "label": "a",
+      "source": "1157978668683299226",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1043027222809675776",
+      "label": "b",
+      "source": "1157978668683299226",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "492968837554438176",
+      "label": "c",
+      "source": "1157978668683299226",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00052"
+}
+```
diff --git a/docs/test_cases/t00052_class.svg b/docs/test_cases/t00052_class.svg
index fc42ddc9..edb6b1d6 100644
--- a/docs/test_cases/t00052_class.svg
+++ b/docs/test_cases/t00052_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="390px" preserveAspectRatio="none" style="width:459px;height:390px;" version="1.1" viewBox="0 0 459 390" width="459px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1vmyi8uxxw9ml" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f3vp3go6o6em" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vmyi8uxxw9ml)" height="73.6094" id="C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="6" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vp3go6o6em)" height="73.6094" id="C_0002200853067459698271" style="stroke: #A80036; stroke-width: 1.5;" width="186" x="6" y="171"/>
       <ellipse cx="90.75" cy="187" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M93.7188,192.6406 Q93.1406,192.9375 92.5,193.0781 Q91.8594,193.2344 91.1563,193.2344 Q88.6563,193.2344 87.3281,191.5938 Q86.0156,189.9375 86.0156,186.8125 Q86.0156,183.6875 87.3281,182.0313 Q88.6563,180.375 91.1563,180.375 Q91.8594,180.375 92.5,180.5313 Q93.1563,180.6875 93.7188,180.9844 L93.7188,183.7031 Q93.0938,183.125 92.5,182.8594 Q91.9063,182.5781 91.2813,182.5781 Q89.9375,182.5781 89.25,183.6563 Q88.5625,184.7188 88.5625,186.8125 Q88.5625,188.9063 89.25,189.9844 Q89.9375,191.0469 91.2813,191.0469 Q91.9063,191.0469 92.5,190.7813 Q93.0938,190.5 93.7188,189.9219 L93.7188,192.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="111.25" y="191.1543">A</text>
@@ -21,8 +21,8 @@
       <ellipse cx="17" cy="234.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="26" y="238.0151">aa&lt;F,Q&gt;(F &amp;&amp; f, Q q) : void</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vmyi8uxxw9ml)" height="73.6094" id="C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="156" y="306"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vp3go6o6em)" height="73.6094" id="C_0001737293776724790064" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="156" y="306"/>
       <ellipse cx="218.25" cy="322" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M221.2188,327.6406 Q220.6406,327.9375 220,328.0781 Q219.3594,328.2344 218.6563,328.2344 Q216.1563,328.2344 214.8281,326.5938 Q213.5156,324.9375 213.5156,321.8125 Q213.5156,318.6875 214.8281,317.0313 Q216.1563,315.375 218.6563,315.375 Q219.3594,315.375 220,315.5313 Q220.6563,315.6875 221.2188,315.9844 L221.2188,318.7031 Q220.5938,318.125 220,317.8594 Q219.4063,317.5781 218.7813,317.5781 Q217.4375,317.5781 216.75,318.6563 Q216.0625,319.7188 216.0625,321.8125 Q216.0625,323.9063 216.75,324.9844 Q217.4375,326.0469 218.7813,326.0469 Q219.4063,326.0469 220,325.7813 Q220.5938,325.5 221.2188,324.9219 L221.2188,327.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="238.75" y="326.1543">B</text>
@@ -35,8 +35,8 @@
       <ellipse cx="167" cy="369.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="126" x="176" y="373.0151">bb&lt;F&gt;(F &amp;&amp; f, T t) : T</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vmyi8uxxw9ml)" height="60.8047" id="C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="343" y="312.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vp3go6o6em)" height="60.8047" id="C_0000687756639884832524" style="stroke: #A80036; stroke-width: 1.5;" width="102" x="343" y="312.5"/>
       <ellipse cx="380.95" cy="328.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M383.9188,334.1406 Q383.3406,334.4375 382.7,334.5781 Q382.0594,334.7344 381.3563,334.7344 Q378.8563,334.7344 377.5281,333.0938 Q376.2156,331.4375 376.2156,328.3125 Q376.2156,325.1875 377.5281,323.5313 Q378.8563,321.875 381.3563,321.875 Q382.0594,321.875 382.7,322.0313 Q383.3563,322.1875 383.9188,322.4844 L383.9188,325.2031 Q383.2938,324.625 382.7,324.3594 Q382.1063,324.0781 381.4813,324.0781 Q380.1375,324.0781 379.45,325.1563 Q378.7625,326.2188 378.7625,328.3125 Q378.7625,330.4063 379.45,331.4844 Q380.1375,332.5469 381.4813,332.5469 Q382.1063,332.5469 382.7,332.2813 Q383.2938,332 383.9188,331.4219 L383.9188,334.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="400.05" y="332.6543">C</text>
@@ -47,7 +47,7 @@
       <rect fill="#F24D5C" height="6" style="stroke: #C82930; stroke-width: 1.0;" width="6" x="351" y="360.5"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="76" x="363" y="366.7104">c&lt;P&gt;(P p) : T</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#f1vmyi8uxxw9ml)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
+    <rect fill="#FEFECE" filter="url(#f3vp3go6o6em)" height="48" id="C_0001043027222809675776" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="227" y="184"/>
     <ellipse cx="242" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M244.9688,205.6406 Q244.3906,205.9375 243.75,206.0781 Q243.1094,206.2344 242.4063,206.2344 Q239.9063,206.2344 238.5781,204.5938 Q237.2656,202.9375 237.2656,199.8125 Q237.2656,196.6875 238.5781,195.0313 Q239.9063,193.375 242.4063,193.375 Q243.1094,193.375 243.75,193.5313 Q244.4063,193.6875 244.9688,193.9844 L244.9688,196.7031 Q244.3438,196.125 243.75,195.8594 Q243.1563,195.5781 242.5313,195.5781 Q241.1875,195.5781 240.5,196.6563 Q239.8125,197.7188 239.8125,199.8125 Q239.8125,201.9063 240.5,202.9844 Q241.1875,204.0469 242.5313,204.0469 Q243.1563,204.0469 243.75,203.7813 Q244.3438,203.5 244.9688,202.9219 L244.9688,205.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="256" y="204.1543">B</text>
@@ -55,7 +55,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="273" y="193.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="216" y2="216"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="228" x2="286" y1="224" y2="224"/>
-    <rect fill="#FEFECE" filter="url(#f1vmyi8uxxw9ml)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
+    <rect fill="#FEFECE" filter="url(#f3vp3go6o6em)" height="48" id="C_0000492968837554438176" style="stroke: #A80036; stroke-width: 1.5;" width="60" x="351" y="184"/>
     <ellipse cx="366" cy="200" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M368.9688,205.6406 Q368.3906,205.9375 367.75,206.0781 Q367.1094,206.2344 366.4063,206.2344 Q363.9063,206.2344 362.5781,204.5938 Q361.2656,202.9375 361.2656,199.8125 Q361.2656,196.6875 362.5781,195.0313 Q363.9063,193.375 366.4063,193.375 Q367.1094,193.375 367.75,193.5313 Q368.4063,193.6875 368.9688,193.9844 L368.9688,196.7031 Q368.3438,196.125 367.75,195.8594 Q367.1563,195.5781 366.5313,195.5781 Q365.1875,195.5781 364.5,196.6563 Q363.8125,197.7188 363.8125,199.8125 Q363.8125,201.9063 364.5,202.9844 Q365.1875,204.0469 366.5313,204.0469 Q367.1563,204.0469 367.75,203.7813 Q368.3438,203.5 368.9688,202.9219 L368.9688,205.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="380" y="204.1543">C</text>
@@ -63,32 +63,32 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="16" x="397" y="193.1387">int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="216" y2="216"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="352" x2="410" y1="224" y2="224"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1vmyi8uxxw9ml)" height="86.4141" id="C_0001157978668683299226" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="214.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L29" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L29" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f3vp3go6o6em)" height="86.4141" id="C_0001157978668683299226" style="stroke: #A80036; stroke-width: 1.5;" width="85" x="214.5" y="8"/>
       <ellipse cx="249.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M252.7188,29.6406 Q252.1406,29.9375 251.5,30.0781 Q250.8594,30.2344 250.1563,30.2344 Q247.6563,30.2344 246.3281,28.5938 Q245.0156,26.9375 245.0156,23.8125 Q245.0156,20.6875 246.3281,19.0313 Q247.6563,17.375 250.1563,17.375 Q250.8594,17.375 251.5,17.5313 Q252.1563,17.6875 252.7188,17.9844 L252.7188,20.7031 Q252.0938,20.125 251.5,19.8594 Q250.9063,19.5781 250.2813,19.5781 Q248.9375,19.5781 248.25,20.6563 Q247.5625,21.7188 247.5625,23.8125 Q247.5625,25.9063 248.25,26.9844 Q248.9375,28.0469 250.2813,28.0469 Q250.9063,28.0469 251.5,27.7813 Q252.0938,27.5 252.7188,26.9219 L252.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="268.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="46"/>
       <ellipse cx="225.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L30" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L30" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="234.5" y="54.2104">a : A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="58.8047"/>
       <ellipse cx="225.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L31" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L31" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="59" x="234.5" y="67.0151">b : B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="220.5" y="71.6094"/>
       <ellipse cx="225.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L32" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00052/t00052.cc#L32" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="58" x="234.5" y="79.8198">c : C&lt;int&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="215.5" x2="298.5" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00053.md b/docs/test_cases/t00053.md
index 24e04454..a157614e 100644
--- a/docs/test_cases/t00053.md
+++ b/docs/test_cases/t00053.md
@@ -52,3 +52,339 @@ enum class j { jjj };
 ```
 ## Generated UML diagrams
 ![t00053_class](./t00053_class.svg "Test case for `together` layout hint in class diagram")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::a",
+      "id": "347629837292519144",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "a",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 3
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::b",
+      "id": "1376344645244260547",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "b",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 4
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::c",
+      "id": "504463801094568803",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "c",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 5
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::d",
+      "id": "1264455164862224089",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "d",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::e",
+      "id": "907921963776939609",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "e",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::f",
+      "id": "1421289128664274084",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "f",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::g",
+      "id": "200227126708762001",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "g",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::A",
+      "id": "322642841130459425",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::B",
+      "id": "876623970071162908",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 12
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::C",
+      "id": "1248473990784124468",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 13
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::D",
+      "id": "470228045297785394",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 14
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::E",
+      "id": "1038384764221361257",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 15
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::F",
+      "id": "530253748811039667",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 16
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00053::G",
+      "id": "1031614323468823578",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 17
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "constants": [
+        "hhh"
+      ],
+      "display_name": "clanguml::t00053::h",
+      "id": "190978367074032185",
+      "is_nested": false,
+      "name": "h",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 19
+      },
+      "type": "enum"
+    },
+    {
+      "constants": [
+        "iii"
+      ],
+      "display_name": "clanguml::t00053::i",
+      "id": "1473214620883985930",
+      "is_nested": false,
+      "name": "i",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 20
+      },
+      "type": "enum"
+    },
+    {
+      "constants": [
+        "jjj"
+      ],
+      "display_name": "clanguml::t00053::j",
+      "id": "965083605473661435",
+      "is_nested": false,
+      "name": "j",
+      "namespace": "clanguml::t00053",
+      "source_location": {
+        "file": "../../tests/t00053/t00053.cc",
+        "line": 21
+      },
+      "type": "enum"
+    }
+  ],
+  "name": "t00053_class",
+  "relationships": [],
+  "using_namespace": "clanguml::t00053"
+}
+```
diff --git a/docs/test_cases/t00053_class.svg b/docs/test_cases/t00053_class.svg
index d47d42e5..69100fba 100644
--- a/docs/test_cases/t00053_class.svg
+++ b/docs/test_cases/t00053_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="340px" preserveAspectRatio="none" style="width:698px;height:340px;" version="1.1" viewBox="0 0 698 340" width="698px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f16kos0jg7mt6c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1gsczot2l3pqv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,72 +9,72 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0000322642841130459425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L11" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L11" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0000322642841130459425" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="46.5"/>
       <ellipse cx="249" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M251.9688,68.1406 Q251.3906,68.4375 250.75,68.5781 Q250.1094,68.7344 249.4063,68.7344 Q246.9063,68.7344 245.5781,67.0938 Q244.2656,65.4375 244.2656,62.3125 Q244.2656,59.1875 245.5781,57.5313 Q246.9063,55.875 249.4063,55.875 Q250.1094,55.875 250.75,56.0313 Q251.4063,56.1875 251.9688,56.4844 L251.9688,59.2031 Q251.3438,58.625 250.75,58.3594 Q250.1563,58.0781 249.5313,58.0781 Q248.1875,58.0781 247.5,59.1563 Q246.8125,60.2188 246.8125,62.3125 Q246.8125,64.4063 247.5,65.4844 Q248.1875,66.5469 249.5313,66.5469 Q250.1563,66.5469 250.75,66.2813 Q251.3438,66 251.9688,65.4219 L251.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="66.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0001248473990784124468" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L13" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L13" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0001248473990784124468" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="309" y="46.5"/>
       <ellipse cx="324" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M326.9688,68.1406 Q326.3906,68.4375 325.75,68.5781 Q325.1094,68.7344 324.4063,68.7344 Q321.9063,68.7344 320.5781,67.0938 Q319.2656,65.4375 319.2656,62.3125 Q319.2656,59.1875 320.5781,57.5313 Q321.9063,55.875 324.4063,55.875 Q325.1094,55.875 325.75,56.0313 Q326.4063,56.1875 326.9688,56.4844 L326.9688,59.2031 Q326.3438,58.625 325.75,58.3594 Q325.1563,58.0781 324.5313,58.0781 Q323.1875,58.0781 322.5,59.1563 Q321.8125,60.2188 321.8125,62.3125 Q321.8125,64.4063 322.5,65.4844 Q323.1875,66.5469 324.5313,66.5469 Q325.1563,66.5469 325.75,66.2813 Q326.3438,66 326.9688,65.4219 L326.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="338" y="66.6543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310" x2="348" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0001038384764221361257" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L15" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L15" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0001038384764221361257" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="234" y="161"/>
       <ellipse cx="249" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M251.9688,182.6406 Q251.3906,182.9375 250.75,183.0781 Q250.1094,183.2344 249.4063,183.2344 Q246.9063,183.2344 245.5781,181.5938 Q244.2656,179.9375 244.2656,176.8125 Q244.2656,173.6875 245.5781,172.0313 Q246.9063,170.375 249.4063,170.375 Q250.1094,170.375 250.75,170.5313 Q251.4063,170.6875 251.9688,170.9844 L251.9688,173.7031 Q251.3438,173.125 250.75,172.8594 Q250.1563,172.5781 249.5313,172.5781 Q248.1875,172.5781 247.5,173.6563 Q246.8125,174.7188 246.8125,176.8125 Q246.8125,178.9063 247.5,179.9844 Q248.1875,181.0469 249.5313,181.0469 Q250.1563,181.0469 250.75,180.7813 Q251.3438,180.5 251.9688,179.9219 L251.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="263" y="181.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="235" x2="273" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0000530253748811039667" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="309.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L16" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L16" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0000530253748811039667" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="309.5" y="161"/>
       <ellipse cx="324.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M327.4688,182.6406 Q326.8906,182.9375 326.25,183.0781 Q325.6094,183.2344 324.9063,183.2344 Q322.4063,183.2344 321.0781,181.5938 Q319.7656,179.9375 319.7656,176.8125 Q319.7656,173.6875 321.0781,172.0313 Q322.4063,170.375 324.9063,170.375 Q325.6094,170.375 326.25,170.5313 Q326.9063,170.6875 327.4688,170.9844 L327.4688,173.7031 Q326.8438,173.125 326.25,172.8594 Q325.6563,172.5781 325.0313,172.5781 Q323.6875,172.5781 323,173.6563 Q322.3125,174.7188 322.3125,176.8125 Q322.3125,178.9063 323,179.9844 Q323.6875,181.0469 325.0313,181.0469 Q325.6563,181.0469 326.25,180.7813 Q326.8438,180.5 327.4688,179.9219 L327.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="338.5" y="181.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="310.5" x2="347.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0000347629837292519144" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0000347629837292519144" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="46.5"/>
       <ellipse cx="420" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M422.9688,68.1406 Q422.3906,68.4375 421.75,68.5781 Q421.1094,68.7344 420.4063,68.7344 Q417.9063,68.7344 416.5781,67.0938 Q415.2656,65.4375 415.2656,62.3125 Q415.2656,59.1875 416.5781,57.5313 Q417.9063,55.875 420.4063,55.875 Q421.1094,55.875 421.75,56.0313 Q422.4063,56.1875 422.9688,56.4844 L422.9688,59.2031 Q422.3438,58.625 421.75,58.3594 Q421.1563,58.0781 420.5313,58.0781 Q419.1875,58.0781 418.5,59.1563 Q417.8125,60.2188 417.8125,62.3125 Q417.8125,64.4063 418.5,65.4844 Q419.1875,66.5469 420.5313,66.5469 Q421.1563,66.5469 421.75,66.2813 Q422.3438,66 422.9688,65.4219 L422.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="66.6543">a</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0000504463801094568803" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="480.5" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L5" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L5" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0000504463801094568803" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="480.5" y="46.5"/>
       <ellipse cx="495.5" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M498.4688,68.1406 Q497.8906,68.4375 497.25,68.5781 Q496.6094,68.7344 495.9063,68.7344 Q493.4063,68.7344 492.0781,67.0938 Q490.7656,65.4375 490.7656,62.3125 Q490.7656,59.1875 492.0781,57.5313 Q493.4063,55.875 495.9063,55.875 Q496.6094,55.875 497.25,56.0313 Q497.9063,56.1875 498.4688,56.4844 L498.4688,59.2031 Q497.8438,58.625 497.25,58.3594 Q496.6563,58.0781 496.0313,58.0781 Q494.6875,58.0781 494,59.1563 Q493.3125,60.2188 493.3125,62.3125 Q493.3125,64.4063 494,65.4844 Q494.6875,66.5469 496.0313,66.5469 Q496.6563,66.5469 497.25,66.2813 Q497.8438,66 498.4688,65.4219 L498.4688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="509.5" y="66.6543">c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481.5" x2="518.5" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0000907921963776939609" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L7" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L7" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0000907921963776939609" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="405" y="161"/>
       <ellipse cx="420" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M422.9688,182.6406 Q422.3906,182.9375 421.75,183.0781 Q421.1094,183.2344 420.4063,183.2344 Q417.9063,183.2344 416.5781,181.5938 Q415.2656,179.9375 415.2656,176.8125 Q415.2656,173.6875 416.5781,172.0313 Q417.9063,170.375 420.4063,170.375 Q421.1094,170.375 421.75,170.5313 Q422.4063,170.6875 422.9688,170.9844 L422.9688,173.7031 Q422.3438,173.125 421.75,172.8594 Q421.1563,172.5781 420.5313,172.5781 Q419.1875,172.5781 418.5,173.6563 Q417.8125,174.7188 417.8125,176.8125 Q417.8125,178.9063 418.5,179.9844 Q419.1875,181.0469 420.5313,181.0469 Q421.1563,181.0469 421.75,180.7813 Q422.3438,180.5 422.9688,179.9219 L422.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="434" y="181.1543">e</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="406" x2="444" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0001421289128664274084" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="480" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L8" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L8" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0001421289128664274084" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="480" y="161"/>
       <ellipse cx="495" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M497.9688,182.6406 Q497.3906,182.9375 496.75,183.0781 Q496.1094,183.2344 495.4063,183.2344 Q492.9063,183.2344 491.5781,181.5938 Q490.2656,179.9375 490.2656,176.8125 Q490.2656,173.6875 491.5781,172.0313 Q492.9063,170.375 495.4063,170.375 Q496.1094,170.375 496.75,170.5313 Q497.4063,170.6875 497.9688,170.9844 L497.9688,173.7031 Q497.3438,173.125 496.75,172.8594 Q496.1563,172.5781 495.5313,172.5781 Q494.1875,172.5781 493.5,173.6563 Q492.8125,174.7188 492.8125,176.8125 Q492.8125,178.9063 493.5,179.9844 Q494.1875,181.0469 495.5313,181.0469 Q496.1563,181.0469 496.75,180.7813 Q497.3438,180.5 497.9688,179.9219 L497.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="509" y="181.1543">f</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="481" x2="515" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="60.8047" id="C_0000190978367074032185" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="647" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L19" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L19" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="60.8047" id="C_0000190978367074032185" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="647" y="40"/>
       <ellipse cx="662" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M666.1094,62 L658.3906,62 L658.3906,49.6094 L666.1094,49.6094 L666.1094,51.7656 L660.8438,51.7656 L660.8438,54.4375 L665.6094,54.4375 L665.6094,56.5938 L660.8438,56.5938 L660.8438,59.8438 L666.1094,59.8438 L666.1094,62 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="676" y="60.1543">h</text>
@@ -82,8 +82,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="653" y="86.2104">hhh</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="648" x2="686" y1="92.8047" y2="92.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="60.8047" id="C_0000965083605473661435" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="576.5" y="40"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L21" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L21" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="60.8047" id="C_0000965083605473661435" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="576.5" y="40"/>
       <ellipse cx="591.5" cy="56" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M595.6094,62 L587.8906,62 L587.8906,49.6094 L595.6094,49.6094 L595.6094,51.7656 L590.3438,51.7656 L590.3438,54.4375 L595.1094,54.4375 L595.1094,56.5938 L590.3438,56.5938 L590.3438,59.8438 L595.6094,59.8438 L595.6094,62 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="605.5" y="60.1543">j</text>
@@ -91,56 +91,56 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="582.5" y="86.2104">jjj</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="577.5" x2="610.5" y1="92.8047" y2="92.8047"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0001376344645244260547" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0001376344645244260547" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="46.5"/>
       <ellipse cx="21" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,68.1406 Q23.3906,68.4375 22.75,68.5781 Q22.1094,68.7344 21.4063,68.7344 Q18.9063,68.7344 17.5781,67.0938 Q16.2656,65.4375 16.2656,62.3125 Q16.2656,59.1875 17.5781,57.5313 Q18.9063,55.875 21.4063,55.875 Q22.1094,55.875 22.75,56.0313 Q23.4063,56.1875 23.9688,56.4844 L23.9688,59.2031 Q23.3438,58.625 22.75,58.3594 Q22.1563,58.0781 21.5313,58.0781 Q20.1875,58.0781 19.5,59.1563 Q18.8125,60.2188 18.8125,62.3125 Q18.8125,64.4063 19.5,65.4844 Q20.1875,66.5469 21.5313,66.5469 Q22.1563,66.5469 22.75,66.2813 Q23.3438,66 23.9688,65.4219 L23.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="66.6543">b</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0001264455164862224089" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L6" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L6" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0001264455164862224089" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="46.5"/>
       <ellipse cx="96" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,68.1406 Q98.3906,68.4375 97.75,68.5781 Q97.1094,68.7344 96.4063,68.7344 Q93.9063,68.7344 92.5781,67.0938 Q91.2656,65.4375 91.2656,62.3125 Q91.2656,59.1875 92.5781,57.5313 Q93.9063,55.875 96.4063,55.875 Q97.1094,55.875 97.75,56.0313 Q98.4063,56.1875 98.9688,56.4844 L98.9688,59.2031 Q98.3438,58.625 97.75,58.3594 Q97.1563,58.0781 96.5313,58.0781 Q95.1875,58.0781 94.5,59.1563 Q93.8125,60.2188 93.8125,62.3125 Q93.8125,64.4063 94.5,65.4844 Q95.1875,66.5469 96.5313,66.5469 Q97.1563,66.5469 97.75,66.2813 Q98.3438,66 98.9688,65.4219 L98.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="66.6543">d</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0000200227126708762001" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="46.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L9" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L9" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0000200227126708762001" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="46.5"/>
       <ellipse cx="171" cy="62.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,68.1406 Q173.3906,68.4375 172.75,68.5781 Q172.1094,68.7344 171.4063,68.7344 Q168.9063,68.7344 167.5781,67.0938 Q166.2656,65.4375 166.2656,62.3125 Q166.2656,59.1875 167.5781,57.5313 Q168.9063,55.875 171.4063,55.875 Q172.1094,55.875 172.75,56.0313 Q173.4063,56.1875 173.9688,56.4844 L173.9688,59.2031 Q173.3438,58.625 172.75,58.3594 Q172.1563,58.0781 171.5313,58.0781 Q170.1875,58.0781 169.5,59.1563 Q168.8125,60.2188 168.8125,62.3125 Q168.8125,64.4063 169.5,65.4844 Q170.1875,66.5469 171.5313,66.5469 Q172.1563,66.5469 172.75,66.2813 Q173.3438,66 173.9688,65.4219 L173.9688,68.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="66.6543">g</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="78.5" y2="78.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="86.5" y2="86.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0000876623970071162908" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L12" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L12" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0000876623970071162908" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="161"/>
       <ellipse cx="21" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,182.6406 Q23.3906,182.9375 22.75,183.0781 Q22.1094,183.2344 21.4063,183.2344 Q18.9063,183.2344 17.5781,181.5938 Q16.2656,179.9375 16.2656,176.8125 Q16.2656,173.6875 17.5781,172.0313 Q18.9063,170.375 21.4063,170.375 Q22.1094,170.375 22.75,170.5313 Q23.4063,170.6875 23.9688,170.9844 L23.9688,173.7031 Q23.3438,173.125 22.75,172.8594 Q22.1563,172.5781 21.5313,172.5781 Q20.1875,172.5781 19.5,173.6563 Q18.8125,174.7188 18.8125,176.8125 Q18.8125,178.9063 19.5,179.9844 Q20.1875,181.0469 21.5313,181.0469 Q22.1563,181.0469 22.75,180.7813 Q23.3438,180.5 23.9688,179.9219 L23.9688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="181.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0000470228045297785394" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="81.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L14" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L14" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0000470228045297785394" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="81.5" y="161"/>
       <ellipse cx="96.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M99.4688,182.6406 Q98.8906,182.9375 98.25,183.0781 Q97.6094,183.2344 96.9063,183.2344 Q94.4063,183.2344 93.0781,181.5938 Q91.7656,179.9375 91.7656,176.8125 Q91.7656,173.6875 93.0781,172.0313 Q94.4063,170.375 96.9063,170.375 Q97.6094,170.375 98.25,170.5313 Q98.9063,170.6875 99.4688,170.9844 L99.4688,173.7031 Q98.8438,173.125 98.25,172.8594 Q97.6563,172.5781 97.0313,172.5781 Q95.6875,172.5781 95,173.6563 Q94.3125,174.7188 94.3125,176.8125 Q94.3125,178.9063 95,179.9844 Q95.6875,181.0469 97.0313,181.0469 Q97.6563,181.0469 98.25,180.7813 Q98.8438,180.5 99.4688,179.9219 L99.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="110.5" y="181.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82.5" x2="121.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="48" id="C_0001031614323468823578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="157.5" y="161"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L17" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L17" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="48" id="C_0001031614323468823578" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="157.5" y="161"/>
       <ellipse cx="172.5" cy="177" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M175.4688,182.6406 Q174.8906,182.9375 174.25,183.0781 Q173.6094,183.2344 172.9063,183.2344 Q170.4063,183.2344 169.0781,181.5938 Q167.7656,179.9375 167.7656,176.8125 Q167.7656,173.6875 169.0781,172.0313 Q170.4063,170.375 172.9063,170.375 Q173.6094,170.375 174.25,170.5313 Q174.9063,170.6875 175.4688,170.9844 L175.4688,173.7031 Q174.8438,173.125 174.25,172.8594 Q173.6563,172.5781 173.0313,172.5781 Q171.6875,172.5781 171,173.6563 Q170.3125,174.7188 170.3125,176.8125 Q170.3125,178.9063 171,179.9844 Q171.6875,181.0469 173.0313,181.0469 Q173.6563,181.0469 174.25,180.7813 Q174.8438,180.5 175.4688,179.9219 L175.4688,182.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="186.5" y="181.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="193" y2="193"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="158.5" x2="197.5" y1="201" y2="201"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f16kos0jg7mt6c)" height="60.8047" id="C_0001473214620883985930" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="8.5" y="269"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L20" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00053/t00053.cc#L20" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1gsczot2l3pqv)" height="60.8047" id="C_0001473214620883985930" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="8.5" y="269"/>
       <ellipse cx="23.5" cy="285" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M27.6094,291 L19.8906,291 L19.8906,278.6094 L27.6094,278.6094 L27.6094,280.7656 L22.3438,280.7656 L22.3438,283.4375 L27.1094,283.4375 L27.1094,285.5938 L22.3438,285.5938 L22.3438,288.8438 L27.6094,288.8438 L27.6094,291 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="37.5" y="289.1543">i</text>
diff --git a/docs/test_cases/t00054.md b/docs/test_cases/t00054.md
index 4563343c..cd368dc6 100644
--- a/docs/test_cases/t00054.md
+++ b/docs/test_cases/t00054.md
@@ -66,3 +66,367 @@ enum class j { jjj };
 ```
 ## Generated UML diagrams
 ![t00054_class](./t00054_class.svg "Test case for `together` layout hint in class diagram with rendered namespaces")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00054::a",
+      "id": "1158868779503074564",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "a",
+      "namespace": "clanguml::t00054",
+      "source_location": {
+        "file": "../../tests/t00054/t00054.cc",
+        "line": 3
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00054::b",
+      "id": "252416999805673718",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "b",
+      "namespace": "clanguml::t00054",
+      "source_location": {
+        "file": "../../tests/t00054/t00054.cc",
+        "line": 4
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "display_name": "clanguml::t00054::detail",
+      "elements": [
+        {
+          "bases": [],
+          "display_name": "clanguml::t00054::detail::c",
+          "id": "1168031834662719964",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "c",
+          "namespace": "clanguml::t00054::detail",
+          "source_location": {
+            "file": "../../tests/t00054/t00054.cc",
+            "line": 7
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00054::detail::d",
+          "id": "1569559620782547158",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "d",
+          "namespace": "clanguml::t00054::detail",
+          "source_location": {
+            "file": "../../tests/t00054/t00054.cc",
+            "line": 8
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00054::detail::e",
+          "id": "2037550833462858827",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "e",
+          "namespace": "clanguml::t00054::detail",
+          "source_location": {
+            "file": "../../tests/t00054/t00054.cc",
+            "line": 9
+          },
+          "template_parameters": [],
+          "type": "class"
+        }
+      ],
+      "name": "detail",
+      "type": "namespace"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00054::f",
+      "id": "2123626454198320938",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "f",
+      "namespace": "clanguml::t00054",
+      "source_location": {
+        "file": "../../tests/t00054/t00054.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00054::g",
+      "id": "595494794840378320",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "g",
+      "namespace": "clanguml::t00054",
+      "source_location": {
+        "file": "../../tests/t00054/t00054.cc",
+        "line": 12
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00054::A",
+      "id": "917656824503504804",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00054",
+      "source_location": {
+        "file": "../../tests/t00054/t00054.cc",
+        "line": 14
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00054::B",
+      "id": "1235773045370563004",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00054",
+      "source_location": {
+        "file": "../../tests/t00054/t00054.cc",
+        "line": 15
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "display_name": "clanguml::t00054::detail2",
+      "elements": [
+        {
+          "bases": [],
+          "display_name": "clanguml::t00054::detail2::C",
+          "id": "540054955081677892",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "C",
+          "namespace": "clanguml::t00054::detail2",
+          "source_location": {
+            "file": "../../tests/t00054/t00054.cc",
+            "line": 18
+          },
+          "template_parameters": [],
+          "type": "class"
+        },
+        {
+          "display_name": "clanguml::t00054::detail2::detail3",
+          "elements": [
+            {
+              "bases": [],
+              "display_name": "clanguml::t00054::detail2::detail3::D",
+              "id": "1266390196945323478",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": true,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "D",
+              "namespace": "clanguml::t00054::detail2::detail3",
+              "source_location": {
+                "file": "../../tests/t00054/t00054.cc",
+                "line": 20
+              },
+              "template_parameters": [],
+              "type": "class"
+            },
+            {
+              "bases": [],
+              "display_name": "clanguml::t00054::detail2::detail3::E",
+              "id": "134928214982255105",
+              "is_abstract": false,
+              "is_nested": false,
+              "is_struct": true,
+              "is_template": false,
+              "is_union": false,
+              "members": [],
+              "methods": [],
+              "name": "E",
+              "namespace": "clanguml::t00054::detail2::detail3",
+              "source_location": {
+                "file": "../../tests/t00054/t00054.cc",
+                "line": 21
+              },
+              "template_parameters": [],
+              "type": "class"
+            }
+          ],
+          "name": "detail3",
+          "type": "namespace"
+        },
+        {
+          "bases": [],
+          "display_name": "clanguml::t00054::detail2::F",
+          "id": "446694692150903211",
+          "is_abstract": false,
+          "is_nested": false,
+          "is_struct": true,
+          "is_template": false,
+          "is_union": false,
+          "members": [],
+          "methods": [],
+          "name": "F",
+          "namespace": "clanguml::t00054::detail2",
+          "source_location": {
+            "file": "../../tests/t00054/t00054.cc",
+            "line": 23
+          },
+          "template_parameters": [],
+          "type": "class"
+        }
+      ],
+      "name": "detail2",
+      "type": "namespace"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00054::G",
+      "id": "1365815261671395853",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00054",
+      "source_location": {
+        "file": "../../tests/t00054/t00054.cc",
+        "line": 25
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "display_name": "clanguml::t00054::detail4",
+      "elements": [
+        {
+          "constants": [
+            "hhh"
+          ],
+          "display_name": "clanguml::t00054::detail4::h",
+          "id": "1592677999268391183",
+          "is_nested": false,
+          "name": "h",
+          "namespace": "clanguml::t00054::detail4",
+          "source_location": {
+            "file": "../../tests/t00054/t00054.cc",
+            "line": 28
+          },
+          "type": "enum"
+        },
+        {
+          "constants": [
+            "iii"
+          ],
+          "display_name": "clanguml::t00054::detail4::i",
+          "id": "441521323390223397",
+          "is_nested": false,
+          "name": "i",
+          "namespace": "clanguml::t00054::detail4",
+          "source_location": {
+            "file": "../../tests/t00054/t00054.cc",
+            "line": 29
+          },
+          "type": "enum"
+        },
+        {
+          "constants": [
+            "jjj"
+          ],
+          "display_name": "clanguml::t00054::detail4::j",
+          "id": "499334434426587347",
+          "is_nested": false,
+          "name": "j",
+          "namespace": "clanguml::t00054::detail4",
+          "source_location": {
+            "file": "../../tests/t00054/t00054.cc",
+            "line": 30
+          },
+          "type": "enum"
+        }
+      ],
+      "name": "detail4",
+      "type": "namespace"
+    }
+  ],
+  "name": "t00054_class",
+  "relationships": [],
+  "using_namespace": "clanguml::t00054"
+}
+```
diff --git a/docs/test_cases/t00054_class.svg b/docs/test_cases/t00054_class.svg
index 58d8752f..79817306 100644
--- a/docs/test_cases/t00054_class.svg
+++ b/docs/test_cases/t00054_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="380px" preserveAspectRatio="none" style="width:1774px;height:380px;" version="1.1" viewBox="0 0 1774 380" width="1774px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1o63kkvbzhgnb" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1qvvovqvv5b87" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,116 +9,116 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1o63kkvbzhgnb)" points="707,67,756,67,763,89.2969,1049,89.2969,1049,214,707,214,707,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1qvvovqvv5b87)" points="707,67,756,67,763,89.2969,1049,89.2969,1049,214,707,214,707,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="707" x2="763" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="43" x="711" y="81.9951">detail</text>
-    <polygon fill="#FFFFFF" filter="url(#f1o63kkvbzhgnb)" points="1073,24,1132,24,1139,46.2969,1752,46.2969,1752,238,1073,238,1073,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1qvvovqvv5b87)" points="1073,24,1132,24,1139,46.2969,1752,46.2969,1752,238,1073,238,1073,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="1073" x2="1139" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1077" y="38.9951">detail2</text>
-    <polygon fill="#FFFFFF" filter="url(#f1o63kkvbzhgnb)" points="1531,67,1590,67,1597,89.2969,1728,89.2969,1728,214,1531,214,1531,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1qvvovqvv5b87)" points="1531,67,1590,67,1597,89.2969,1728,89.2969,1728,214,1531,214,1531,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="1531" x2="1597" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="1535" y="81.9951">detail3</text>
-    <polygon fill="#FFFFFF" filter="url(#f1o63kkvbzhgnb)" points="22,54,81,54,88,76.2969,377,76.2969,377,368,22,368,22,54" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1qvvovqvv5b87)" points="22,54,81,54,88,76.2969,377,76.2969,377,368,22,368,22,54" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="88" y1="76.2969" y2="76.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="53" x="26" y="68.9951">detail4</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0001569559620782547158" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="723" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L8" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L8" xlink:show="new" xlink:title="d" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0001569559620782547158" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="723" y="126"/>
       <ellipse cx="738" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M740.9688,147.6406 Q740.3906,147.9375 739.75,148.0781 Q739.1094,148.2344 738.4063,148.2344 Q735.9063,148.2344 734.5781,146.5938 Q733.2656,144.9375 733.2656,141.8125 Q733.2656,138.6875 734.5781,137.0313 Q735.9063,135.375 738.4063,135.375 Q739.1094,135.375 739.75,135.5313 Q740.4063,135.6875 740.9688,135.9844 L740.9688,138.7031 Q740.3438,138.125 739.75,137.8594 Q739.1563,137.5781 738.5313,137.5781 Q737.1875,137.5781 736.5,138.6563 Q735.8125,139.7188 735.8125,141.8125 Q735.8125,143.9063 736.5,144.9844 Q737.1875,146.0469 738.5313,146.0469 Q739.1563,146.0469 739.75,145.7813 Q740.3438,145.5 740.9688,144.9219 L740.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="752" y="146.1543">d</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="724" x2="762" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L3" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L3" xlink:show="new" xlink:title="a" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0001158868779503074564" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="969" y="126"/>
       <ellipse cx="984" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M986.9688,147.6406 Q986.3906,147.9375 985.75,148.0781 Q985.1094,148.2344 984.4063,148.2344 Q981.9063,148.2344 980.5781,146.5938 Q979.2656,144.9375 979.2656,141.8125 Q979.2656,138.6875 980.5781,137.0313 Q981.9063,135.375 984.4063,135.375 Q985.1094,135.375 985.75,135.5313 Q986.4063,135.6875 986.9688,135.9844 L986.9688,138.7031 Q986.3438,138.125 985.75,137.8594 Q985.1563,137.5781 984.5313,137.5781 Q983.1875,137.5781 982.5,138.6563 Q981.8125,139.7188 981.8125,141.8125 Q981.8125,143.9063 982.5,144.9844 Q983.1875,146.0469 984.5313,146.0469 Q985.1563,146.0469 985.75,145.7813 Q986.3438,145.5 986.9688,144.9219 L986.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="998" y="146.1543">a</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="970" x2="1008" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L7" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L7" xlink:show="new" xlink:title="c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0001168031834662719964" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="873.5" y="126"/>
       <ellipse cx="888.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M891.4688,147.6406 Q890.8906,147.9375 890.25,148.0781 Q889.6094,148.2344 888.9063,148.2344 Q886.4063,148.2344 885.0781,146.5938 Q883.7656,144.9375 883.7656,141.8125 Q883.7656,138.6875 885.0781,137.0313 Q886.4063,135.375 888.9063,135.375 Q889.6094,135.375 890.25,135.5313 Q890.9063,135.6875 891.4688,135.9844 L891.4688,138.7031 Q890.8438,138.125 890.25,137.8594 Q889.6563,137.5781 889.0313,137.5781 Q887.6875,137.5781 887,138.6563 Q886.3125,139.7188 886.3125,141.8125 Q886.3125,143.9063 887,144.9844 Q887.6875,146.0469 889.0313,146.0469 Q889.6563,146.0469 890.25,145.7813 Q890.8438,145.5 891.4688,144.9219 L891.4688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="902.5" y="146.1543">c</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="874.5" x2="911.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L9" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L9" xlink:show="new" xlink:title="e" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0002037550833462858827" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="798" y="126"/>
       <ellipse cx="813" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M815.9688,147.6406 Q815.3906,147.9375 814.75,148.0781 Q814.1094,148.2344 813.4063,148.2344 Q810.9063,148.2344 809.5781,146.5938 Q808.2656,144.9375 808.2656,141.8125 Q808.2656,138.6875 809.5781,137.0313 Q810.9063,135.375 813.4063,135.375 Q814.1094,135.375 814.75,135.5313 Q815.4063,135.6875 815.9688,135.9844 L815.9688,138.7031 Q815.3438,138.125 814.75,137.8594 Q814.1563,137.5781 813.5313,137.5781 Q812.1875,137.5781 811.5,138.6563 Q810.8125,139.7188 810.8125,141.8125 Q810.8125,143.9063 811.5,144.9844 Q812.1875,146.0469 813.5313,146.0469 Q814.1563,146.0469 814.75,145.7813 Q815.3438,145.5 815.9688,144.9219 L815.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="827" y="146.1543">e</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="799" x2="837" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0000540054955081677892" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1209" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0000540054955081677892" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1209" y="126"/>
       <ellipse cx="1224" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1226.9688,147.6406 Q1226.3906,147.9375 1225.75,148.0781 Q1225.1094,148.2344 1224.4063,148.2344 Q1221.9063,148.2344 1220.5781,146.5938 Q1219.2656,144.9375 1219.2656,141.8125 Q1219.2656,138.6875 1220.5781,137.0313 Q1221.9063,135.375 1224.4063,135.375 Q1225.1094,135.375 1225.75,135.5313 Q1226.4063,135.6875 1226.9688,135.9844 L1226.9688,138.7031 Q1226.3438,138.125 1225.75,137.8594 Q1225.1563,137.5781 1224.5313,137.5781 Q1223.1875,137.5781 1222.5,138.6563 Q1221.8125,139.7188 1221.8125,141.8125 Q1221.8125,143.9063 1222.5,144.9844 Q1223.1875,146.0469 1224.5313,146.0469 Q1225.1563,146.0469 1225.75,145.7813 Q1226.3438,145.5 1226.9688,144.9219 L1226.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1238" y="146.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1210" x2="1248" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0000446694692150903211" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="1134.5" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L23" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L23" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0000446694692150903211" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="1134.5" y="126"/>
       <ellipse cx="1149.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1152.4688,147.6406 Q1151.8906,147.9375 1151.25,148.0781 Q1150.6094,148.2344 1149.9063,148.2344 Q1147.4063,148.2344 1146.0781,146.5938 Q1144.7656,144.9375 1144.7656,141.8125 Q1144.7656,138.6875 1146.0781,137.0313 Q1147.4063,135.375 1149.9063,135.375 Q1150.6094,135.375 1151.25,135.5313 Q1151.9063,135.6875 1152.4688,135.9844 L1152.4688,138.7031 Q1151.8438,138.125 1151.25,137.8594 Q1150.6563,137.5781 1150.0313,137.5781 Q1148.6875,137.5781 1148,138.6563 Q1147.3125,139.7188 1147.3125,141.8125 Q1147.3125,143.9063 1148,144.9844 Q1148.6875,146.0469 1150.0313,146.0469 Q1150.6563,146.0469 1151.25,145.7813 Q1151.8438,145.5 1152.4688,144.9219 L1152.4688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="1163.5" y="146.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1135.5" x2="1172.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0001266390196945323478" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1646.5" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L20" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L20" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0001266390196945323478" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="1646.5" y="126"/>
       <ellipse cx="1661.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1664.4688,147.6406 Q1663.8906,147.9375 1663.25,148.0781 Q1662.6094,148.2344 1661.9063,148.2344 Q1659.4063,148.2344 1658.0781,146.5938 Q1656.7656,144.9375 1656.7656,141.8125 Q1656.7656,138.6875 1658.0781,137.0313 Q1659.4063,135.375 1661.9063,135.375 Q1662.6094,135.375 1663.25,135.5313 Q1663.9063,135.6875 1664.4688,135.9844 L1664.4688,138.7031 Q1663.8438,138.125 1663.25,137.8594 Q1662.6563,137.5781 1662.0313,137.5781 Q1660.6875,137.5781 1660,138.6563 Q1659.3125,139.7188 1659.3125,141.8125 Q1659.3125,143.9063 1660,144.9844 Q1660.6875,146.0469 1662.0313,146.0469 Q1662.6563,146.0469 1663.25,145.7813 Q1663.8438,145.5 1664.4688,144.9219 L1664.4688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1675.5" y="146.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1647.5" x2="1686.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0000134928214982255105" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1571" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L21" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L21" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0000134928214982255105" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1571" y="126"/>
       <ellipse cx="1586" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1588.9688,147.6406 Q1588.3906,147.9375 1587.75,148.0781 Q1587.1094,148.2344 1586.4063,148.2344 Q1583.9063,148.2344 1582.5781,146.5938 Q1581.2656,144.9375 1581.2656,141.8125 Q1581.2656,138.6875 1582.5781,137.0313 Q1583.9063,135.375 1586.4063,135.375 Q1587.1094,135.375 1587.75,135.5313 Q1588.4063,135.6875 1588.9688,135.9844 L1588.9688,138.7031 Q1588.3438,138.125 1587.75,137.8594 Q1587.1563,137.5781 1586.5313,137.5781 Q1585.1875,137.5781 1584.5,138.6563 Q1583.8125,139.7188 1583.8125,141.8125 Q1583.8125,143.9063 1584.5,144.9844 Q1585.1875,146.0469 1586.5313,146.0469 Q1587.1563,146.0469 1587.75,145.7813 Q1588.3438,145.5 1588.9688,144.9219 L1588.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1600" y="146.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1572" x2="1610" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0000917656824503504804" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1451" y="126"/>
       <ellipse cx="1466" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1468.9688,147.6406 Q1468.3906,147.9375 1467.75,148.0781 Q1467.1094,148.2344 1466.4063,148.2344 Q1463.9063,148.2344 1462.5781,146.5938 Q1461.2656,144.9375 1461.2656,141.8125 Q1461.2656,138.6875 1462.5781,137.0313 Q1463.9063,135.375 1466.4063,135.375 Q1467.1094,135.375 1467.75,135.5313 Q1468.4063,135.6875 1468.9688,135.9844 L1468.9688,138.7031 Q1468.3438,138.125 1467.75,137.8594 Q1467.1563,137.5781 1466.5313,137.5781 Q1465.1875,137.5781 1464.5,138.6563 Q1463.8125,139.7188 1463.8125,141.8125 Q1463.8125,143.9063 1464.5,144.9844 Q1465.1875,146.0469 1466.5313,146.0469 Q1467.1563,146.0469 1467.75,145.7813 Q1468.3438,145.5 1468.9688,144.9219 L1468.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1480" y="146.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1452" x2="1490" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0001235773045370563004" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="1376" y="126"/>
       <ellipse cx="1391" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1393.9688,147.6406 Q1393.3906,147.9375 1392.75,148.0781 Q1392.1094,148.2344 1391.4063,148.2344 Q1388.9063,148.2344 1387.5781,146.5938 Q1386.2656,144.9375 1386.2656,141.8125 Q1386.2656,138.6875 1387.5781,137.0313 Q1388.9063,135.375 1391.4063,135.375 Q1392.1094,135.375 1392.75,135.5313 Q1393.4063,135.6875 1393.9688,135.9844 L1393.9688,138.7031 Q1393.3438,138.125 1392.75,137.8594 Q1392.1563,137.5781 1391.5313,137.5781 Q1390.1875,137.5781 1389.5,138.6563 Q1388.8125,139.7188 1388.8125,141.8125 Q1388.8125,143.9063 1389.5,144.9844 Q1390.1875,146.0469 1391.5313,146.0469 Q1392.1563,146.0469 1392.75,145.7813 Q1393.3438,145.5 1393.9688,144.9219 L1393.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="1405" y="146.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1377" x2="1415" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L11" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L11" xlink:show="new" xlink:title="f" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0002123626454198320938" style="stroke: #A80036; stroke-width: 1.5;" width="36" x="1284" y="126"/>
       <ellipse cx="1299" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1301.9688,147.6406 Q1301.3906,147.9375 1300.75,148.0781 Q1300.1094,148.2344 1299.4063,148.2344 Q1296.9063,148.2344 1295.5781,146.5938 Q1294.2656,144.9375 1294.2656,141.8125 Q1294.2656,138.6875 1295.5781,137.0313 Q1296.9063,135.375 1299.4063,135.375 Q1300.1094,135.375 1300.75,135.5313 Q1301.4063,135.6875 1301.9688,135.9844 L1301.9688,138.7031 Q1301.3438,138.125 1300.75,137.8594 Q1300.1563,137.5781 1299.5313,137.5781 Q1298.1875,137.5781 1297.5,138.6563 Q1296.8125,139.7188 1296.8125,141.8125 Q1296.8125,143.9063 1297.5,144.9844 Q1298.1875,146.0469 1299.5313,146.0469 Q1300.1563,146.0469 1300.75,145.7813 Q1301.3438,145.5 1301.9688,144.9219 L1301.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="4" x="1313" y="146.1543">f</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1285" x2="1319" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L25" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L25" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0001365815261671395853" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="295.5" y="126"/>
       <ellipse cx="310.5" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M313.4688,147.6406 Q312.8906,147.9375 312.25,148.0781 Q311.6094,148.2344 310.9063,148.2344 Q308.4063,148.2344 307.0781,146.5938 Q305.7656,144.9375 305.7656,141.8125 Q305.7656,138.6875 307.0781,137.0313 Q308.4063,135.375 310.9063,135.375 Q311.6094,135.375 312.25,135.5313 Q312.9063,135.6875 313.4688,135.9844 L313.4688,138.7031 Q312.8438,138.125 312.25,137.8594 Q311.6563,137.5781 311.0313,137.5781 Q309.6875,137.5781 309,138.6563 Q308.3125,139.7188 308.3125,141.8125 Q308.3125,143.9063 309,144.9844 Q309.6875,146.0469 311.0313,146.0469 Q311.6563,146.0469 312.25,145.7813 Q312.8438,145.5 313.4688,144.9219 L313.4688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="324.5" y="146.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="296.5" x2="335.5" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="73.6094" id="C_0001592677999268391183" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="128" y="113"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L28" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L28" xlink:show="new" xlink:title="h" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="73.6094" id="C_0001592677999268391183" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="128" y="113"/>
       <ellipse cx="143" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M147.1094,135 L139.3906,135 L139.3906,122.6094 L147.1094,122.6094 L147.1094,124.7656 L141.8438,124.7656 L141.8438,127.4375 L146.6094,127.4375 L146.6094,129.5938 L141.8438,129.5938 L141.8438,132.8438 L147.1094,132.8438 L147.1094,135 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="157" y="133.1543">h</text>
@@ -127,8 +127,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="134" y="172.0151">hhh</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="129" x2="167" y1="178.6094" y2="178.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="73.6094" id="C_0000441521323390223397" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="203.5" y="113"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L29" target="_top" title="i" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L29" xlink:show="new" xlink:title="i" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="73.6094" id="C_0000441521323390223397" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="203.5" y="113"/>
       <ellipse cx="218.5" cy="129" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M222.6094,135 L214.8906,135 L214.8906,122.6094 L222.6094,122.6094 L222.6094,124.7656 L217.3438,124.7656 L217.3438,127.4375 L222.1094,127.4375 L222.1094,129.5938 L217.3438,129.5938 L217.3438,132.8438 L222.6094,132.8438 L222.6094,135 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="232.5" y="133.1543">i</text>
@@ -137,8 +137,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="172.0151">iii</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="204.5" x2="237.5" y1="178.6094" y2="178.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="73.6094" id="C_0000499334434426587347" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="130.5" y="254"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L30" target="_top" title="j" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L30" xlink:show="new" xlink:title="j" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="73.6094" id="C_0000499334434426587347" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="130.5" y="254"/>
       <ellipse cx="145.5" cy="270" fill="#EB937F" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M149.6094,276 L141.8906,276 L141.8906,263.6094 L149.6094,263.6094 L149.6094,265.7656 L144.3438,265.7656 L144.3438,268.4375 L149.1094,268.4375 L149.1094,270.5938 L144.3438,270.5938 L144.3438,273.8438 L149.6094,273.8438 L149.6094,276 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="159.5" y="274.1543">j</text>
@@ -147,16 +147,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="9" x="136.5" y="313.0151">jjj</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="131.5" x2="164.5" y1="319.6094" y2="319.6094"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0000252416999805673718" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="573" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L4" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L4" xlink:show="new" xlink:title="b" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0000252416999805673718" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="573" y="126"/>
       <ellipse cx="588" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M590.9688,147.6406 Q590.3906,147.9375 589.75,148.0781 Q589.1094,148.2344 588.4063,148.2344 Q585.9063,148.2344 584.5781,146.5938 Q583.2656,144.9375 583.2656,141.8125 Q583.2656,138.6875 584.5781,137.0313 Q585.9063,135.375 588.4063,135.375 Q589.1094,135.375 589.75,135.5313 Q590.4063,135.6875 590.9688,135.9844 L590.9688,138.7031 Q590.3438,138.125 589.75,137.8594 Q589.1563,137.5781 588.5313,137.5781 Q587.1875,137.5781 586.5,138.6563 Q585.8125,139.7188 585.8125,141.8125 Q585.8125,143.9063 586.5,144.9844 Q587.1875,146.0469 588.5313,146.0469 Q589.1563,146.0469 589.75,145.7813 Q590.3438,145.5 590.9688,144.9219 L590.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="602" y="146.1543">b</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="158" y2="158"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="574" x2="612" y1="166" y2="166"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1o63kkvbzhgnb)" height="48" id="C_0000595494794840378320" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="648" y="126"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L12" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00054/t00054.cc#L12" xlink:show="new" xlink:title="g" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1qvvovqvv5b87)" height="48" id="C_0000595494794840378320" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="648" y="126"/>
       <ellipse cx="663" cy="142" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M665.9688,147.6406 Q665.3906,147.9375 664.75,148.0781 Q664.1094,148.2344 663.4063,148.2344 Q660.9063,148.2344 659.5781,146.5938 Q658.2656,144.9375 658.2656,141.8125 Q658.2656,138.6875 659.5781,137.0313 Q660.9063,135.375 663.4063,135.375 Q664.1094,135.375 664.75,135.5313 Q665.4063,135.6875 665.9688,135.9844 L665.9688,138.7031 Q665.3438,138.125 664.75,137.8594 Q664.1563,137.5781 663.5313,137.5781 Q662.1875,137.5781 661.5,138.6563 Q660.8125,139.7188 660.8125,141.8125 Q660.8125,143.9063 661.5,144.9844 Q662.1875,146.0469 663.5313,146.0469 Q664.1563,146.0469 664.75,145.7813 Q665.3438,145.5 665.9688,144.9219 L665.9688,147.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="677" y="146.1543">g</text>
diff --git a/docs/test_cases/t00055.md b/docs/test_cases/t00055.md
index 6ba7921e..fb1813d5 100644
--- a/docs/test_cases/t00055.md
+++ b/docs/test_cases/t00055.md
@@ -39,3 +39,214 @@ struct J { };
 ```
 ## Generated UML diagrams
 ![t00055_class](./t00055_class.svg "Test case for `row` and `column` layout hints")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::A",
+      "id": "1697191682863715554",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 3
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::B",
+      "id": "188599859894721517",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 4
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::C",
+      "id": "625177137967392996",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 5
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::D",
+      "id": "1046415640323289221",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::E",
+      "id": "702117239243796422",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::F",
+      "id": "1511375015718046137",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 8
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::G",
+      "id": "651600874645139639",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 9
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::H",
+      "id": "374142601071476038",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "H",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 10
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::I",
+      "id": "295372236079742697",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "I",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00055::J",
+      "id": "769231292718551090",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "J",
+      "namespace": "clanguml::t00055",
+      "source_location": {
+        "file": "../../tests/t00055/t00055.cc",
+        "line": 12
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00055_class",
+  "relationships": [],
+  "using_namespace": "clanguml::t00055"
+}
+```
diff --git a/docs/test_cases/t00055_class.svg b/docs/test_cases/t00055_class.svg
index 1fc2307b..b2164e3b 100644
--- a/docs/test_cases/t00055_class.svg
+++ b/docs/test_cases/t00055_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="499px" preserveAspectRatio="none" style="width:429px;height:499px;" version="1.1" viewBox="0 0 429 499" width="429px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f8zfoxtl7yu9p" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1jyld8pckworr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,80 +9,80 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0001697191682863715554" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0001697191682863715554" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="8"/>
       <ellipse cx="21" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,29.6406 Q23.3906,29.9375 22.75,30.0781 Q22.1094,30.2344 21.4063,30.2344 Q18.9063,30.2344 17.5781,28.5938 Q16.2656,26.9375 16.2656,23.8125 Q16.2656,20.6875 17.5781,19.0313 Q18.9063,17.375 21.4063,17.375 Q22.1094,17.375 22.75,17.5313 Q23.4063,17.6875 23.9688,17.9844 L23.9688,20.7031 Q23.3438,20.125 22.75,19.8594 Q22.1563,19.5781 21.5313,19.5781 Q20.1875,19.5781 19.5,20.6563 Q18.8125,21.7188 18.8125,23.8125 Q18.8125,25.9063 19.5,26.9844 Q20.1875,28.0469 21.5313,28.0469 Q22.1563,28.0469 22.75,27.7813 Q23.3438,27.5 23.9688,26.9219 L23.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="28.1543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0000188599859894721517" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="378" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0000188599859894721517" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="378" y="8"/>
       <ellipse cx="393" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.9688,29.6406 Q395.3906,29.9375 394.75,30.0781 Q394.1094,30.2344 393.4063,30.2344 Q390.9063,30.2344 389.5781,28.5938 Q388.2656,26.9375 388.2656,23.8125 Q388.2656,20.6875 389.5781,19.0313 Q390.9063,17.375 393.4063,17.375 Q394.1094,17.375 394.75,17.5313 Q395.4063,17.6875 395.9688,17.9844 L395.9688,20.7031 Q395.3438,20.125 394.75,19.8594 Q394.1563,19.5781 393.5313,19.5781 Q392.1875,19.5781 391.5,20.6563 Q390.8125,21.7188 390.8125,23.8125 Q390.8125,25.9063 391.5,26.9844 Q392.1875,28.0469 393.5313,28.0469 Q394.1563,28.0469 394.75,27.7813 Q395.3438,27.5 395.9688,26.9219 L395.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="407" y="28.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379" x2="417" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0000625177137967392996" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0000625177137967392996" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="8"/>
       <ellipse cx="96" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,29.6406 Q98.3906,29.9375 97.75,30.0781 Q97.1094,30.2344 96.4063,30.2344 Q93.9063,30.2344 92.5781,28.5938 Q91.2656,26.9375 91.2656,23.8125 Q91.2656,20.6875 92.5781,19.0313 Q93.9063,17.375 96.4063,17.375 Q97.1094,17.375 97.75,17.5313 Q98.4063,17.6875 98.9688,17.9844 L98.9688,20.7031 Q98.3438,20.125 97.75,19.8594 Q97.1563,19.5781 96.5313,19.5781 Q95.1875,19.5781 94.5,20.6563 Q93.8125,21.7188 93.8125,23.8125 Q93.8125,25.9063 94.5,26.9844 Q95.1875,28.0469 96.5313,28.0469 Q97.1563,28.0469 97.75,27.7813 Q98.3438,27.5 98.9688,26.9219 L98.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="28.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0001046415640323289221" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="116"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0001046415640323289221" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="116"/>
       <ellipse cx="392.5" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.4688,137.6406 Q394.8906,137.9375 394.25,138.0781 Q393.6094,138.2344 392.9063,138.2344 Q390.4063,138.2344 389.0781,136.5938 Q387.7656,134.9375 387.7656,131.8125 Q387.7656,128.6875 389.0781,127.0313 Q390.4063,125.375 392.9063,125.375 Q393.6094,125.375 394.25,125.5313 Q394.9063,125.6875 395.4688,125.9844 L395.4688,128.7031 Q394.8438,128.125 394.25,127.8594 Q393.6563,127.5781 393.0313,127.5781 Q391.6875,127.5781 391,128.6563 Q390.3125,129.7188 390.3125,131.8125 Q390.3125,133.9063 391,134.9844 Q391.6875,136.0469 393.0313,136.0469 Q393.6563,136.0469 394.25,135.7813 Q394.8438,135.5 395.4688,134.9219 L395.4688,137.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="136.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="148" y2="148"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="156" y2="156"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0000702117239243796422" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L7" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L7" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0000702117239243796422" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="156" y="8"/>
       <ellipse cx="171" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.9688,29.6406 Q173.3906,29.9375 172.75,30.0781 Q172.1094,30.2344 171.4063,30.2344 Q168.9063,30.2344 167.5781,28.5938 Q166.2656,26.9375 166.2656,23.8125 Q166.2656,20.6875 167.5781,19.0313 Q168.9063,17.375 171.4063,17.375 Q172.1094,17.375 172.75,17.5313 Q173.4063,17.6875 173.9688,17.9844 L173.9688,20.7031 Q173.3438,20.125 172.75,19.8594 Q172.1563,19.5781 171.5313,19.5781 Q170.1875,19.5781 169.5,20.6563 Q168.8125,21.7188 168.8125,23.8125 Q168.8125,25.9063 169.5,26.9844 Q170.1875,28.0469 171.5313,28.0469 Q172.1563,28.0469 172.75,27.7813 Q173.3438,27.5 173.9688,26.9219 L173.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="185" y="28.1543">E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="157" x2="195" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0001511375015718046137" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="378.5" y="224"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L8" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L8" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0001511375015718046137" style="stroke: #A80036; stroke-width: 1.5;" width="39" x="378.5" y="224"/>
       <ellipse cx="393.5" cy="240" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M396.4688,245.6406 Q395.8906,245.9375 395.25,246.0781 Q394.6094,246.2344 393.9063,246.2344 Q391.4063,246.2344 390.0781,244.5938 Q388.7656,242.9375 388.7656,239.8125 Q388.7656,236.6875 390.0781,235.0313 Q391.4063,233.375 393.9063,233.375 Q394.6094,233.375 395.25,233.5313 Q395.9063,233.6875 396.4688,233.9844 L396.4688,236.7031 Q395.8438,236.125 395.25,235.8594 Q394.6563,235.5781 394.0313,235.5781 Q392.6875,235.5781 392,236.6563 Q391.3125,237.7188 391.3125,239.8125 Q391.3125,241.9063 392,242.9844 Q392.6875,244.0469 394.0313,244.0469 Q394.6563,244.0469 395.25,243.7813 Q395.8438,243.5 396.4688,242.9219 L396.4688,245.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="407.5" y="244.1543">F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="256" y2="256"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="379.5" x2="416.5" y1="264" y2="264"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0000651600874645139639" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L9" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L9" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0000651600874645139639" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="231.5" y="8"/>
       <ellipse cx="246.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M249.4688,29.6406 Q248.8906,29.9375 248.25,30.0781 Q247.6094,30.2344 246.9063,30.2344 Q244.4063,30.2344 243.0781,28.5938 Q241.7656,26.9375 241.7656,23.8125 Q241.7656,20.6875 243.0781,19.0313 Q244.4063,17.375 246.9063,17.375 Q247.6094,17.375 248.25,17.5313 Q248.9063,17.6875 249.4688,17.9844 L249.4688,20.7031 Q248.8438,20.125 248.25,19.8594 Q247.6563,19.5781 247.0313,19.5781 Q245.6875,19.5781 245,20.6563 Q244.3125,21.7188 244.3125,23.8125 Q244.3125,25.9063 245,26.9844 Q245.6875,28.0469 247.0313,28.0469 Q247.6563,28.0469 248.25,27.7813 Q248.8438,27.5 249.4688,26.9219 L249.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="260.5" y="28.1543">G</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="232.5" x2="271.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0000374142601071476038" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="332"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L10" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L10" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0000374142601071476038" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="377.5" y="332"/>
       <ellipse cx="392.5" cy="348" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M395.4688,353.6406 Q394.8906,353.9375 394.25,354.0781 Q393.6094,354.2344 392.9063,354.2344 Q390.4063,354.2344 389.0781,352.5938 Q387.7656,350.9375 387.7656,347.8125 Q387.7656,344.6875 389.0781,343.0313 Q390.4063,341.375 392.9063,341.375 Q393.6094,341.375 394.25,341.5313 Q394.9063,341.6875 395.4688,341.9844 L395.4688,344.7031 Q394.8438,344.125 394.25,343.8594 Q393.6563,343.5781 393.0313,343.5781 Q391.6875,343.5781 391,344.6563 Q390.3125,345.7188 390.3125,347.8125 Q390.3125,349.9063 391,350.9844 Q391.6875,352.0469 393.0313,352.0469 Q393.6563,352.0469 394.25,351.7813 Q394.8438,351.5 395.4688,350.9219 L395.4688,353.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="406.5" y="352.1543">H</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="364" y2="364"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="378.5" x2="417.5" y1="372" y2="372"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0000295372236079742697" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="307.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L11" target="_top" title="I" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L11" xlink:show="new" xlink:title="I" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0000295372236079742697" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="307.5" y="8"/>
       <ellipse cx="322.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M325.4688,29.6406 Q324.8906,29.9375 324.25,30.0781 Q323.6094,30.2344 322.9063,30.2344 Q320.4063,30.2344 319.0781,28.5938 Q317.7656,26.9375 317.7656,23.8125 Q317.7656,20.6875 319.0781,19.0313 Q320.4063,17.375 322.9063,17.375 Q323.6094,17.375 324.25,17.5313 Q324.9063,17.6875 325.4688,17.9844 L325.4688,20.7031 Q324.8438,20.125 324.25,19.8594 Q323.6563,19.5781 323.0313,19.5781 Q321.6875,19.5781 321,20.6563 Q320.3125,21.7188 320.3125,23.8125 Q320.3125,25.9063 321,26.9844 Q321.6875,28.0469 323.0313,28.0469 Q323.6563,28.0469 324.25,27.7813 Q324.8438,27.5 325.4688,26.9219 L325.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="336.5" y="28.1543">I</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="40" y2="40"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="308.5" x2="341.5" y1="48" y2="48"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f8zfoxtl7yu9p)" height="48" id="C_0000769231292718551090" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="380.5" y="440"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L12" target="_top" title="J" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00055/t00055.cc#L12" xlink:show="new" xlink:title="J" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1jyld8pckworr)" height="48" id="C_0000769231292718551090" style="stroke: #A80036; stroke-width: 1.5;" width="35" x="380.5" y="440"/>
       <ellipse cx="395.5" cy="456" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M398.4688,461.6406 Q397.8906,461.9375 397.25,462.0781 Q396.6094,462.2344 395.9063,462.2344 Q393.4063,462.2344 392.0781,460.5938 Q390.7656,458.9375 390.7656,455.8125 Q390.7656,452.6875 392.0781,451.0313 Q393.4063,449.375 395.9063,449.375 Q396.6094,449.375 397.25,449.5313 Q397.9063,449.6875 398.4688,449.9844 L398.4688,452.7031 Q397.8438,452.125 397.25,451.8594 Q396.6563,451.5781 396.0313,451.5781 Q394.6875,451.5781 394,452.6563 Q393.3125,453.7188 393.3125,455.8125 Q393.3125,457.9063 394,458.9844 Q394.6875,460.0469 396.0313,460.0469 Q396.6563,460.0469 397.25,459.7813 Q397.8438,459.5 398.4688,458.9219 L398.4688,461.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="3" x="409.5" y="460.1543">J</text>
diff --git a/docs/test_cases/t00056.md b/docs/test_cases/t00056.md
index 188159cb..0c6b7439 100644
--- a/docs/test_cases/t00056.md
+++ b/docs/test_cases/t00056.md
@@ -113,3 +113,538 @@ struct F {
 ```
 ## Generated UML diagrams
 ![t00056_class](./t00056_class.svg "Basic C++20 concepts test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "display_name": "clanguml::t00056::greater_than_simple<T,L>",
+      "id": "902541696362244204",
+      "name": "greater_than_simple",
+      "namespace": "clanguml::t00056",
+      "parameters": [],
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 7
+      },
+      "statements": [],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00056::greater_than_with_requires<T,P>",
+      "id": "1830716585637735576",
+      "name": "greater_than_with_requires",
+      "namespace": "clanguml::t00056",
+      "parameters": [
+        {
+          "name": "clanguml::t00056::l",
+          "type": "T"
+        },
+        {
+          "name": "clanguml::t00056::r",
+          "type": "P"
+        }
+      ],
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 10
+      },
+      "statements": [
+        "sizeof (l) > sizeof (r)"
+      ],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00056::max_four_bytes<T>",
+      "id": "385255522691733325",
+      "name": "max_four_bytes",
+      "namespace": "clanguml::t00056",
+      "parameters": [],
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 15
+      },
+      "statements": [],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00056::iterable<T>",
+      "id": "392540961352249242",
+      "name": "iterable",
+      "namespace": "clanguml::t00056",
+      "parameters": [
+        {
+          "name": "clanguml::t00056::container",
+          "type": "T"
+        }
+      ],
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 19
+      },
+      "statements": [
+        "container.begin()",
+        "container.end()"
+      ],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00056::has_value_type<T>",
+      "id": "1850394311226276678",
+      "name": "has_value_type",
+      "namespace": "clanguml::t00056",
+      "parameters": [],
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 26
+      },
+      "statements": [
+        "typename T::value_type"
+      ],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00056::convertible_to_string<T>",
+      "id": "137304962071054497",
+      "name": "convertible_to_string",
+      "namespace": "clanguml::t00056",
+      "parameters": [
+        {
+          "name": "clanguml::t00056::s",
+          "type": "T"
+        }
+      ],
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 29
+      },
+      "statements": [
+        "std::string{s}",
+        "{std::to_string(s)} noexcept",
+        "{std::to_string(s)} -> std::same_as<std::string>"
+      ],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00056::iterable_with_value_type<T>",
+      "id": "1043398062146751019",
+      "name": "iterable_with_value_type",
+      "namespace": "clanguml::t00056",
+      "parameters": [],
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 45
+      },
+      "statements": [],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00056::iterable_or_small_value_type<T>",
+      "id": "866345615551223718",
+      "name": "iterable_or_small_value_type",
+      "namespace": "clanguml::t00056",
+      "parameters": [],
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 48
+      },
+      "statements": [],
+      "type": "concept"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00056::A<clanguml::t00056::max_four_bytes T>",
+      "id": "1418333499545421661",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 53
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00056",
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 52
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00056::B<T>",
+      "id": "1814355496814977880",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 60
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00056",
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 59
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00056::C<clanguml::t00056::convertible_to_string T>",
+      "id": "1512618198241549089",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 70
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00056",
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 69
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00056::D<clanguml::t00056::iterable T1,T2,clanguml::t00056::iterable T3,T4,T5>",
+      "id": "1635109601630198093",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00056",
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 75
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T1",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T2",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T3",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T4",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T5",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00056::E<T1,T2,T3>",
+      "id": "1429225801945621089",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e1",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 80
+          },
+          "type": "T1"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e2",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 81
+          },
+          "type": "T2"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e3",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 82
+          },
+          "type": "T3"
+        }
+      ],
+      "methods": [],
+      "name": "E",
+      "namespace": "clanguml::t00056",
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 79
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T1",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T2",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T3",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00056::F<T1,T2,T3>",
+      "id": "856301122972546034",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f1",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 88
+          },
+          "type": "T1"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f2",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 89
+          },
+          "type": "T2"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f3",
+          "source_location": {
+            "file": "../../tests/t00056/t00056.cc",
+            "line": 90
+          },
+          "type": "T3"
+        }
+      ],
+      "methods": [],
+      "name": "F",
+      "namespace": "clanguml::t00056",
+      "source_location": {
+        "file": "../../tests/t00056/t00056.cc",
+        "line": 87
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T1",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T2",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T3",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00056_class",
+  "relationships": [
+    {
+      "destination": "385255522691733325",
+      "label": "T",
+      "source": "137304962071054497",
+      "type": "constraint"
+    },
+    {
+      "destination": "392540961352249242",
+      "label": "T",
+      "source": "1043398062146751019",
+      "type": "constraint"
+    },
+    {
+      "destination": "1850394311226276678",
+      "label": "T",
+      "source": "1043398062146751019",
+      "type": "constraint"
+    },
+    {
+      "destination": "1043398062146751019",
+      "label": "T",
+      "source": "866345615551223718",
+      "type": "constraint"
+    },
+    {
+      "destination": "385255522691733325",
+      "label": "T",
+      "source": "866345615551223718",
+      "type": "constraint"
+    },
+    {
+      "destination": "385255522691733325",
+      "label": "T",
+      "source": "1418333499545421661",
+      "type": "constraint"
+    },
+    {
+      "destination": "866345615551223718",
+      "label": "T",
+      "source": "1814355496814977880",
+      "type": "constraint"
+    },
+    {
+      "destination": "137304962071054497",
+      "label": "T",
+      "source": "1512618198241549089",
+      "type": "constraint"
+    },
+    {
+      "destination": "392540961352249242",
+      "label": "T1",
+      "source": "1635109601630198093",
+      "type": "constraint"
+    },
+    {
+      "destination": "392540961352249242",
+      "label": "T3",
+      "source": "1635109601630198093",
+      "type": "constraint"
+    },
+    {
+      "destination": "385255522691733325",
+      "label": "T2",
+      "source": "1635109601630198093",
+      "type": "constraint"
+    },
+    {
+      "destination": "385255522691733325",
+      "label": "T5",
+      "source": "1635109601630198093",
+      "type": "constraint"
+    },
+    {
+      "destination": "1830716585637735576",
+      "label": "T1,T3",
+      "source": "1429225801945621089",
+      "type": "constraint"
+    },
+    {
+      "destination": "902541696362244204",
+      "label": "T1,T3",
+      "source": "856301122972546034",
+      "type": "constraint"
+    }
+  ],
+  "using_namespace": "clanguml::t00056"
+}
+```
diff --git a/docs/test_cases/t00056_class.svg b/docs/test_cases/t00056_class.svg
index f27bfd7c..fccb4a32 100644
--- a/docs/test_cases/t00056_class.svg
+++ b/docs/test_cases/t00056_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="613px" preserveAspectRatio="none" style="width:1507px;height:613px;" version="1.1" viewBox="0 0 1507 613" width="1507px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fv15q4t4dmwzq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fa2r6jjdt08rp" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L7" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L7" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="53.9375" id="C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="6" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L7" target="_top" title="greater_than_simple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L7" xlink:show="new" xlink:title="greater_than_simple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="53.9375" id="C_0000902541696362244204" style="stroke: #A80036; stroke-width: 1.5;" width="182" x="6" y="184"/>
       <ellipse cx="21" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,208.6094 Q23.3906,208.9063 22.75,209.0469 Q22.1094,209.2031 21.4063,209.2031 Q18.9063,209.2031 17.5781,207.5625 Q16.2656,205.9063 16.2656,202.7813 Q16.2656,199.6563 17.5781,198 Q18.9063,196.3438 21.4063,196.3438 Q22.1094,196.3438 22.75,196.5 Q23.4063,196.6563 23.9688,196.9531 L23.9688,199.6719 Q23.3438,199.0938 22.75,198.8281 Q22.1563,198.5469 21.5313,198.5469 Q20.1875,198.5469 19.5,199.625 Q18.8125,200.6875 18.8125,202.7813 Q18.8125,204.875 19.5,205.9531 Q20.1875,207.0156 21.5313,207.0156 Q22.1563,207.0156 22.75,206.75 Q23.3438,206.4688 23.9688,205.8906 L23.9688,208.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="66.5" y="200.1387">«concept»</text>
@@ -20,8 +20,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="221.9375" y2="221.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="187" y1="229.9375" y2="229.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L10" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L10" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="79.5469" id="C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.5;" width="225" x="223.5" y="171"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L10" target="_top" title="greater_than_with_requires" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L10" xlink:show="new" xlink:title="greater_than_with_requires" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="79.5469" id="C_0001830716585637735576" style="stroke: #A80036; stroke-width: 1.5;" width="225" x="223.5" y="171"/>
       <ellipse cx="238.5" cy="189.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M241.4688,195.6094 Q240.8906,195.9063 240.25,196.0469 Q239.6094,196.2031 238.9063,196.2031 Q236.4063,196.2031 235.0781,194.5625 Q233.7656,192.9063 233.7656,189.7813 Q233.7656,186.6563 235.0781,185 Q236.4063,183.3438 238.9063,183.3438 Q239.6094,183.3438 240.25,183.5 Q240.9063,183.6563 241.4688,183.9531 L241.4688,186.6719 Q240.8438,186.0938 240.25,185.8281 Q239.6563,185.5469 239.0313,185.5469 Q237.6875,185.5469 237,186.625 Q236.3125,187.6875 236.3125,189.7813 Q236.3125,191.875 237,192.9531 Q237.6875,194.0156 239.0313,194.0156 Q239.6563,194.0156 240.25,193.75 Q240.8438,193.4688 241.4688,192.8906 L241.4688,195.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="305.5" y="187.1387">«concept»</text>
@@ -33,8 +33,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="224.5" x2="447.5" y1="229.7422" y2="229.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="115" x="229.5" y="243.9526">sizeof (l) &gt; sizeof (r)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L15" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L15" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="53.9375" id="C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="843.5" y="529"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L15" target="_top" title="max_four_bytes" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L15" xlink:show="new" xlink:title="max_four_bytes" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="53.9375" id="C_0000385255522691733325" style="stroke: #A80036; stroke-width: 1.5;" width="139" x="843.5" y="529"/>
       <ellipse cx="858.5" cy="547.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M861.4688,553.6094 Q860.8906,553.9063 860.25,554.0469 Q859.6094,554.2031 858.9063,554.2031 Q856.4063,554.2031 855.0781,552.5625 Q853.7656,550.9063 853.7656,547.7813 Q853.7656,544.6563 855.0781,543 Q856.4063,541.3438 858.9063,541.3438 Q859.6094,541.3438 860.25,541.5 Q860.9063,541.6563 861.4688,541.9531 L861.4688,544.6719 Q860.8438,544.0938 860.25,543.8281 Q859.6563,543.5469 859.0313,543.5469 Q857.6875,543.5469 857,544.625 Q856.3125,545.6875 856.3125,547.7813 Q856.3125,549.875 857,550.9531 Q857.6875,552.0156 859.0313,552.0156 Q859.6563,552.0156 860.25,551.75 Q860.8438,551.4688 861.4688,550.8906 L861.4688,553.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="888" y="545.1387">«concept»</text>
@@ -44,8 +44,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="566.9375" y2="566.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="844.5" x2="981.5" y1="574.9375" y2="574.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L19" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L19" xlink:show="new" xlink:title="iterable" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="92.3516" id="C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="1147" y="510"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L19" target="_top" title="iterable" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L19" xlink:show="new" xlink:title="iterable" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="92.3516" id="C_0000392540961352249242" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="1147" y="510"/>
       <ellipse cx="1163.8" cy="528.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1166.7688,534.6094 Q1166.1906,534.9063 1165.55,535.0469 Q1164.9094,535.2031 1164.2063,535.2031 Q1161.7063,535.2031 1160.3781,533.5625 Q1159.0656,531.9063 1159.0656,528.7813 Q1159.0656,525.6563 1160.3781,524 Q1161.7063,522.3438 1164.2063,522.3438 Q1164.9094,522.3438 1165.55,522.5 Q1166.2063,522.6563 1166.7688,522.9531 L1166.7688,525.6719 Q1166.1438,525.0938 1165.55,524.8281 Q1164.9563,524.5469 1164.3313,524.5469 Q1162.9875,524.5469 1162.3,525.625 Q1161.6125,526.6875 1161.6125,528.7813 Q1161.6125,530.875 1162.3,531.9531 Q1162.9875,533.0156 1164.3313,533.0156 Q1164.9563,533.0156 1165.55,532.75 Q1166.1438,532.4688 1166.7688,531.8906 L1166.7688,534.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1176.2" y="526.1387">«concept»</text>
@@ -58,8 +58,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="96" x="1153" y="582.9526">container.begin()</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="86" x="1153" y="595.7573">container.end()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L26" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L26" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="79.5469" id="C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="1322.5" y="516"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L26" target="_top" title="has_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L26" xlink:show="new" xlink:title="has_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="79.5469" id="C_0001850394311226276678" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="1322.5" y="516"/>
       <ellipse cx="1341.55" cy="534.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1344.5188,540.6094 Q1343.9406,540.9063 1343.3,541.0469 Q1342.6594,541.2031 1341.9563,541.2031 Q1339.4563,541.2031 1338.1281,539.5625 Q1336.8156,537.9063 1336.8156,534.7813 Q1336.8156,531.6563 1338.1281,530 Q1339.4563,528.3438 1341.9563,528.3438 Q1342.6594,528.3438 1343.3,528.5 Q1343.9563,528.6563 1344.5188,528.9531 L1344.5188,531.6719 Q1343.8938,531.0938 1343.3,530.8281 Q1342.7063,530.5469 1342.0813,530.5469 Q1340.7375,530.5469 1340.05,531.625 Q1339.3625,532.6875 1339.3625,534.7813 Q1339.3625,536.875 1340.05,537.9531 Q1340.7375,539.0156 1342.0813,539.0156 Q1342.7063,539.0156 1343.3,538.75 Q1343.8938,538.4688 1344.5188,537.8906 L1344.5188,540.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371.45" y="532.1387">«concept»</text>
@@ -71,8 +71,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="1323.5" x2="1468.5" y1="574.7422" y2="574.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="135" x="1328.5" y="588.9526">typename T::value_type</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L29" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L29" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="105.1563" id="C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="429.5" y="328"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L29" target="_top" title="convertible_to_string" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L29" xlink:show="new" xlink:title="convertible_to_string" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="105.1563" id="C_0000137304962071054497" style="stroke: #A80036; stroke-width: 1.5;" width="293" x="429.5" y="328"/>
       <ellipse cx="501.25" cy="346.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M504.2188,352.6094 Q503.6406,352.9063 503,353.0469 Q502.3594,353.2031 501.6563,353.2031 Q499.1563,353.2031 497.8281,351.5625 Q496.5156,349.9063 496.5156,346.7813 Q496.5156,343.6563 497.8281,342 Q499.1563,340.3438 501.6563,340.3438 Q502.3594,340.3438 503,340.5 Q503.6563,340.6563 504.2188,340.9531 L504.2188,343.6719 Q503.5938,343.0938 503,342.8281 Q502.4063,342.5469 501.7813,342.5469 Q500.4375,342.5469 499.75,343.625 Q499.0625,344.6875 499.0625,346.7813 Q499.0625,348.875 499.75,349.9531 Q500.4375,351.0156 501.7813,351.0156 Q502.4063,351.0156 503,350.75 Q503.5938,350.4688 504.2188,349.8906 L504.2188,352.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="554.25" y="344.1387">«concept»</text>
@@ -86,8 +86,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="160" x="435.5" y="413.7573">{std::to_string(s)} noexcept</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="281" x="435.5" y="426.562">{std::to_string(s)} -&gt; std::same_as&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L45" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L45" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="53.9375" id="C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="1299" y="353.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L45" target="_top" title="iterable_with_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L45" xlink:show="new" xlink:title="iterable_with_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="53.9375" id="C_0001043398062146751019" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="1299" y="353.5"/>
       <ellipse cx="1314" cy="372.4688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1316.9688,378.1094 Q1316.3906,378.4063 1315.75,378.5469 Q1315.1094,378.7031 1314.4063,378.7031 Q1311.9063,378.7031 1310.5781,377.0625 Q1309.2656,375.4063 1309.2656,372.2813 Q1309.2656,369.1563 1310.5781,367.5 Q1311.9063,365.8438 1314.4063,365.8438 Q1315.1094,365.8438 1315.75,366 Q1316.4063,366.1563 1316.9688,366.4531 L1316.9688,369.1719 Q1316.3438,368.5938 1315.75,368.3281 Q1315.1563,368.0469 1314.5313,368.0469 Q1313.1875,368.0469 1312.5,369.125 Q1311.8125,370.1875 1311.8125,372.2813 Q1311.8125,374.375 1312.5,375.4531 Q1313.1875,376.5156 1314.5313,376.5156 Q1315.1563,376.5156 1315.75,376.25 Q1316.3438,375.9688 1316.9688,375.3906 L1316.9688,378.1094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="1371" y="369.6387">«concept»</text>
@@ -97,8 +97,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="391.4375" y2="391.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1300" x2="1492" y1="399.4375" y2="399.4375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L48" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L48" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="53.9375" id="C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.5;" width="220" x="858" y="184"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L48" target="_top" title="iterable_or_small_value_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L48" xlink:show="new" xlink:title="iterable_or_small_value_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="53.9375" id="C_0000866345615551223718" style="stroke: #A80036; stroke-width: 1.5;" width="220" x="858" y="184"/>
       <ellipse cx="873" cy="202.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M875.9688,208.6094 Q875.3906,208.9063 874.75,209.0469 Q874.1094,209.2031 873.4063,209.2031 Q870.9063,209.2031 869.5781,207.5625 Q868.2656,205.9063 868.2656,202.7813 Q868.2656,199.6563 869.5781,198 Q870.9063,196.3438 873.4063,196.3438 Q874.1094,196.3438 874.75,196.5 Q875.4063,196.6563 875.9688,196.9531 L875.9688,199.6719 Q875.3438,199.0938 874.75,198.8281 Q874.1563,198.5469 873.5313,198.5469 Q872.1875,198.5469 871.5,199.625 Q870.8125,200.6875 870.8125,202.7813 Q870.8125,204.875 871.5,205.9531 Q872.1875,207.0156 873.5313,207.0156 Q874.1563,207.0156 874.75,206.75 Q875.3438,206.4688 875.9688,205.8906 L875.9688,208.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="943" y="200.1387">«concept»</text>
@@ -108,8 +108,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="221.9375" y2="221.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="859" x2="1077" y1="229.9375" y2="229.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L52" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L52" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="60.8047" id="C_0001418333499545421661" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="837" y="350"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L52" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L52" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="60.8047" id="C_0001418333499545421661" style="stroke: #A80036; stroke-width: 1.5;" width="152" x="837" y="350"/>
       <ellipse cx="852" cy="366" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M854.9688,371.6406 Q854.3906,371.9375 853.75,372.0781 Q853.1094,372.2344 852.4063,372.2344 Q849.9063,372.2344 848.5781,370.5938 Q847.2656,368.9375 847.2656,365.8125 Q847.2656,362.6875 848.5781,361.0313 Q849.9063,359.375 852.4063,359.375 Q853.1094,359.375 853.75,359.5313 Q854.4063,359.6875 854.9688,359.9844 L854.9688,362.7031 Q854.3438,362.125 853.75,361.8594 Q853.1563,361.5781 852.5313,361.5781 Q851.1875,361.5781 850.5,362.6563 Q849.8125,363.7188 849.8125,365.8125 Q849.8125,367.9063 850.5,368.9844 Q851.1875,370.0469 852.5313,370.0469 Q853.1563,370.0469 853.75,369.7813 Q854.3438,369.5 854.9688,368.9219 L854.9688,371.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="866" y="370.1543">A</text>
@@ -117,16 +117,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="108" x="883" y="359.1387">max_four_bytes T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="382" y2="382"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L53" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L53" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="843" y="388"/>
       <ellipse cx="848" cy="393" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L53" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L53" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L53" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="857" y="396.2104">a : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="838" x2="988" y1="402.8047" y2="402.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L59" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L59" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="60.8047" id="C_0001814355496814977880" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="942" y="20.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L59" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L59" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="60.8047" id="C_0001814355496814977880" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="942" y="20.5"/>
       <ellipse cx="957.45" cy="36.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M960.4188,42.1406 Q959.8406,42.4375 959.2,42.5781 Q958.5594,42.7344 957.8563,42.7344 Q955.3563,42.7344 954.0281,41.0938 Q952.7156,39.4375 952.7156,36.3125 Q952.7156,33.1875 954.0281,31.5313 Q955.3563,29.875 957.8563,29.875 Q958.5594,29.875 959.2,30.0313 Q959.8563,30.1875 960.4188,30.4844 L960.4188,33.2031 Q959.7938,32.625 959.2,32.3594 Q958.6063,32.0781 957.9813,32.0781 Q956.6375,32.0781 955.95,33.1563 Q955.2625,34.2188 955.2625,36.3125 Q955.2625,38.4063 955.95,39.4844 Q956.6375,40.5469 957.9813,40.5469 Q958.6063,40.5469 959.2,40.2813 Q959.7938,40 960.4188,39.4219 L960.4188,42.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="971.55" y="40.6543">B</text>
@@ -134,16 +134,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="989" y="29.6387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="52.5" y2="52.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L60" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L60" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="948" y="58.5"/>
       <ellipse cx="953" cy="63.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L60" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L60" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L60" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="962" y="66.7104">b : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="943" x2="993" y1="73.3047" y2="73.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L69" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L69" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="60.8047" id="C_0001512618198241549089" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="484" y="180.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L69" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L69" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="60.8047" id="C_0001512618198241549089" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="484" y="180.5"/>
       <ellipse cx="499" cy="196.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M501.9688,202.1406 Q501.3906,202.4375 500.75,202.5781 Q500.1094,202.7344 499.4063,202.7344 Q496.9063,202.7344 495.5781,201.0938 Q494.2656,199.4375 494.2656,196.3125 Q494.2656,193.1875 495.5781,191.5313 Q496.9063,189.875 499.4063,189.875 Q500.1094,189.875 500.75,190.0313 Q501.4063,190.1875 501.9688,190.4844 L501.9688,193.2031 Q501.3438,192.625 500.75,192.3594 Q500.1563,192.0781 499.5313,192.0781 Q498.1875,192.0781 497.5,193.1563 Q496.8125,194.2188 496.8125,196.3125 Q496.8125,198.4063 497.5,199.4844 Q498.1875,200.5469 499.5313,200.5469 Q500.1563,200.5469 500.75,200.2813 Q501.3438,200 501.9688,199.4219 L501.9688,202.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="513" y="200.6543">C</text>
@@ -151,16 +151,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="140" x="530" y="189.6387">convertible_to_string T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="212.5" y2="212.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L70" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L70" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="490" y="218.5"/>
       <ellipse cx="495" cy="223.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L70" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L70" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L70" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="25" x="504" y="226.7104">c : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="485" x2="667" y1="233.3047" y2="233.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L75" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L75" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="48" id="C_0001635109601630198093" style="stroke: #A80036; stroke-width: 1.5;" width="240" x="1024" y="356.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L75" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L75" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="48" id="C_0001635109601630198093" style="stroke: #A80036; stroke-width: 1.5;" width="240" x="1024" y="356.5"/>
       <ellipse cx="1039" cy="372.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1041.9688,378.1406 Q1041.3906,378.4375 1040.75,378.5781 Q1040.1094,378.7344 1039.4063,378.7344 Q1036.9063,378.7344 1035.5781,377.0938 Q1034.2656,375.4375 1034.2656,372.3125 Q1034.2656,369.1875 1035.5781,367.5313 Q1036.9063,365.875 1039.4063,365.875 Q1040.1094,365.875 1040.75,366.0313 Q1041.4063,366.1875 1041.9688,366.4844 L1041.9688,369.2031 Q1041.3438,368.625 1040.75,368.3594 Q1040.1563,368.0781 1039.5313,368.0781 Q1038.1875,368.0781 1037.5,369.1563 Q1036.8125,370.2188 1036.8125,372.3125 Q1036.8125,374.4063 1037.5,375.4844 Q1038.1875,376.5469 1039.5313,376.5469 Q1040.1563,376.5469 1040.75,376.2813 Q1041.3438,376 1041.9688,375.4219 L1041.9688,378.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="1053" y="376.6543">D</text>
@@ -169,8 +169,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="388.5" y2="388.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="1025" x2="1263" y1="396.5" y2="396.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L79" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L79" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="86.4141" id="C_0001429225801945621089" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="287.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L79" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L79" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="86.4141" id="C_0001429225801945621089" style="stroke: #A80036; stroke-width: 1.5;" width="97" x="287.5" y="8"/>
       <ellipse cx="302.5" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M305.4688,29.6406 Q304.8906,29.9375 304.25,30.0781 Q303.6094,30.2344 302.9063,30.2344 Q300.4063,30.2344 299.0781,28.5938 Q297.7656,26.9375 297.7656,23.8125 Q297.7656,20.6875 299.0781,19.0313 Q300.4063,17.375 302.9063,17.375 Q303.6094,17.375 304.25,17.5313 Q304.9063,17.6875 305.4688,17.9844 L305.4688,20.7031 Q304.8438,20.125 304.25,19.8594 Q303.6563,19.5781 303.0313,19.5781 Q301.6875,19.5781 301,20.6563 Q300.3125,21.7188 300.3125,23.8125 Q300.3125,25.9063 301,26.9844 Q301.6875,28.0469 303.0313,28.0469 Q303.6563,28.0469 304.25,27.7813 Q304.8438,27.5 305.4688,26.9219 L305.4688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="316.5" y="28.1543">E</text>
@@ -178,30 +178,30 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="53" x="333.5" y="17.1387">T1,T2,T3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L80" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="e1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L80" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="e1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="46"/>
       <ellipse cx="298.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L80" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="e1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L80" target="_top" title="e1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L80" xlink:show="new" xlink:title="e1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="54.2104">e1 : T1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L81" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L81" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="58.8047"/>
       <ellipse cx="298.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L81" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L81" target="_top" title="e2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L81" xlink:show="new" xlink:title="e2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="67.0151">e2 : T2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L82" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L82" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="293.5" y="71.6094"/>
       <ellipse cx="298.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L82" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L82" target="_top" title="e3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L82" xlink:show="new" xlink:title="e3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="307.5" y="79.8198">e3 : T3</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="288.5" x2="383.5" y1="86.4141" y2="86.4141"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L87" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L87" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fv15q4t4dmwzq)" height="86.4141" id="C_0000856301122972546034" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="49" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L87" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L87" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fa2r6jjdt08rp)" height="86.4141" id="C_0000856301122972546034" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="49" y="8"/>
       <ellipse cx="64" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M66.9688,29.6406 Q66.3906,29.9375 65.75,30.0781 Q65.1094,30.2344 64.4063,30.2344 Q61.9063,30.2344 60.5781,28.5938 Q59.2656,26.9375 59.2656,23.8125 Q59.2656,20.6875 60.5781,19.0313 Q61.9063,17.375 64.4063,17.375 Q65.1094,17.375 65.75,17.5313 Q66.4063,17.6875 66.9688,17.9844 L66.9688,20.7031 Q66.3438,20.125 65.75,19.8594 Q65.1563,19.5781 64.5313,19.5781 Q63.1875,19.5781 62.5,20.6563 Q61.8125,21.7188 61.8125,23.8125 Q61.8125,25.9063 62.5,26.9844 Q63.1875,28.0469 64.5313,28.0469 Q65.1563,28.0469 65.75,27.7813 Q66.3438,27.5 66.9688,26.9219 L66.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="7" x="78" y="28.1543">F</text>
@@ -209,25 +209,25 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="53" x="94" y="17.1387">T1,T2,T3</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L88" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L88" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="46"/>
       <ellipse cx="60" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L88" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L88" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L88" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="54.2104">f1 : T1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L89" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L89" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="58.8047"/>
       <ellipse cx="60" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L89" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L89" target="_top" title="f2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L89" xlink:show="new" xlink:title="f2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="67.0151">f2 : T2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L90" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L90" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f3" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="55" y="71.6094"/>
       <ellipse cx="60" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L90" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f3" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L90" target="_top" title="f3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00056/t00056.cc#L90" xlink:show="new" xlink:title="f3" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="69" y="79.8198">f3 : T3</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="50" x2="144" y1="86.4141" y2="86.4141"/>
diff --git a/docs/test_cases/t00057.md b/docs/test_cases/t00057.md
index d61678a6..1d9f60ba 100644
--- a/docs/test_cases/t00057.md
+++ b/docs/test_cases/t00057.md
@@ -56,3 +56,449 @@ struct t00057_R {
 ```
 ## Generated UML diagrams
 ![t00057_class](./t00057_class.svg "Test case C99/C11 translation units with structs and unions")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "t00057_A",
+      "id": "940295970488928395",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a1",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 4
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_A",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/t00057.c",
+        "line": 3
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "t00057_B",
+      "id": "1030391494410415852",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b1",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 8
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_B",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/t00057.c",
+        "line": 7
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "t00057_C",
+      "id": "388213894542327772",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c1",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 12
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_C",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/t00057.c",
+        "line": 11
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "t00057_D",
+      "id": "784667124248020371",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": true,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "d1",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 16
+          },
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "d2",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 17
+          },
+          "type": "float"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_D",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/t00057.c",
+        "line": 15
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "t00057_E",
+      "id": "682873132844345324",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 21
+          },
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "coordinates",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 25
+          },
+          "type": "t00057_E##(anonymous_739)"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "height",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 29
+          },
+          "type": "t00057_E##(anonymous_807)"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_E",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/t00057.c",
+        "line": 20
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "t00057_E::(coordinates)",
+      "id": "161676142413826748",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "x",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 23
+          },
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "y",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 24
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_E::(coordinates)",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/t00057.c",
+        "line": 22
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "t00057_E::(height)",
+      "id": "2265335931722752750",
+      "is_abstract": false,
+      "is_nested": true,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": true,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "z",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 27
+          },
+          "type": "int"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "t",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 28
+          },
+          "type": "double"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_E::(height)",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/t00057.c",
+        "line": 26
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "t00057_R",
+      "id": "370583978606928327",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 33
+          },
+          "type": "struct t00057_A"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 34
+          },
+          "type": "t00057_B"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "c",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 35
+          },
+          "type": "struct t00057_C *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "d",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 36
+          },
+          "type": "union t00057_D"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "e",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 37
+          },
+          "type": "struct t00057_E *"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f",
+          "source_location": {
+            "file": "../../tests/t00057/t00057.c",
+            "line": 38
+          },
+          "type": "struct t00057_F *"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_R",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/t00057.c",
+        "line": 32
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "t00057_F",
+      "id": "85797106299568719",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "f1",
+          "source_location": {
+            "file": "../../tests/t00057/src/t00057_impl.c",
+            "line": 4
+          },
+          "type": "int"
+        }
+      ],
+      "methods": [],
+      "name": "t00057_F",
+      "namespace": "",
+      "source_location": {
+        "file": "../../tests/t00057/include/t00057.h",
+        "line": 3
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00057_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "161676142413826748",
+      "label": "coordinates",
+      "source": "682873132844345324",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "2265335931722752750",
+      "label": "height",
+      "source": "682873132844345324",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "940295970488928395",
+      "label": "a",
+      "source": "370583978606928327",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1030391494410415852",
+      "label": "b",
+      "source": "370583978606928327",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "388213894542327772",
+      "label": "c",
+      "source": "370583978606928327",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "784667124248020371",
+      "label": "d",
+      "source": "370583978606928327",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "682873132844345324",
+      "label": "e",
+      "source": "370583978606928327",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "85797106299568719",
+      "label": "f",
+      "source": "370583978606928327",
+      "type": "association"
+    }
+  ]
+}
+```
diff --git a/docs/test_cases/t00057_class.svg b/docs/test_cases/t00057_class.svg
index 9b424947..0fbc57ea 100644
--- a/docs/test_cases/t00057_class.svg
+++ b/docs/test_cases/t00057_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="463px" preserveAspectRatio="none" style="width:913px;height:463px;" version="1.1" viewBox="0 0 913 463" width="913px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1tpya34hpw6ls" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1ds2z9gwseg86" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,210 +9,210 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="222.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L3" target="_top" title="t00057_A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L3" xlink:show="new" xlink:title="t00057_A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="60.8047" id="C_0000940295970488928395" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="6" y="222.5"/>
       <ellipse cx="21" cy="238.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,244.1406 Q23.3906,244.4375 22.75,244.5781 Q22.1094,244.7344 21.4063,244.7344 Q18.9063,244.7344 17.5781,243.0938 Q16.2656,241.4375 16.2656,238.3125 Q16.2656,235.1875 17.5781,233.5313 Q18.9063,231.875 21.4063,231.875 Q22.1094,231.875 22.75,232.0313 Q23.4063,232.1875 23.9688,232.4844 L23.9688,235.2031 Q23.3438,234.625 22.75,234.3594 Q22.1563,234.0781 21.5313,234.0781 Q20.1875,234.0781 19.5,235.1563 Q18.8125,236.2188 18.8125,238.3125 Q18.8125,240.4063 19.5,241.4844 Q20.1875,242.5469 21.5313,242.5469 Q22.1563,242.5469 22.75,242.2813 Q23.3438,242 23.9688,241.4219 L23.9688,244.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="35" y="242.6543">t00057_A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="254.5" y2="254.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="260.5"/>
       <ellipse cx="17" cy="265.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L4" target="_top" title="a1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L4" xlink:show="new" xlink:title="a1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="26" y="268.7104">a1 : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="96" y1="275.3047" y2="275.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="222.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L7" target="_top" title="t00057_B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L7" xlink:show="new" xlink:title="t00057_B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="60.8047" id="C_0001030391494410415852" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="132" y="222.5"/>
       <ellipse cx="147" cy="238.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M149.9688,244.1406 Q149.3906,244.4375 148.75,244.5781 Q148.1094,244.7344 147.4063,244.7344 Q144.9063,244.7344 143.5781,243.0938 Q142.2656,241.4375 142.2656,238.3125 Q142.2656,235.1875 143.5781,233.5313 Q144.9063,231.875 147.4063,231.875 Q148.1094,231.875 148.75,232.0313 Q149.4063,232.1875 149.9688,232.4844 L149.9688,235.2031 Q149.3438,234.625 148.75,234.3594 Q148.1563,234.0781 147.5313,234.0781 Q146.1875,234.0781 145.5,235.1563 Q144.8125,236.2188 144.8125,238.3125 Q144.8125,240.4063 145.5,241.4844 Q146.1875,242.5469 147.5313,242.5469 Q148.1563,242.5469 148.75,242.2813 Q149.3438,242 149.9688,241.4219 L149.9688,244.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="161" y="242.6543">t00057_B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="254.5" y2="254.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="138" y="260.5"/>
       <ellipse cx="143" cy="265.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L8" target="_top" title="b1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L8" xlink:show="new" xlink:title="b1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="152" y="268.7104">b1 : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="133" x2="222" y1="275.3047" y2="275.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="222.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L11" target="_top" title="t00057_C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L11" xlink:show="new" xlink:title="t00057_C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="60.8047" id="C_0000388213894542327772" style="stroke: #A80036; stroke-width: 1.5;" width="91" x="258" y="222.5"/>
       <ellipse cx="273" cy="238.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M275.9688,244.1406 Q275.3906,244.4375 274.75,244.5781 Q274.1094,244.7344 273.4063,244.7344 Q270.9063,244.7344 269.5781,243.0938 Q268.2656,241.4375 268.2656,238.3125 Q268.2656,235.1875 269.5781,233.5313 Q270.9063,231.875 273.4063,231.875 Q274.1094,231.875 274.75,232.0313 Q275.4063,232.1875 275.9688,232.4844 L275.9688,235.2031 Q275.3438,234.625 274.75,234.3594 Q274.1563,234.0781 273.5313,234.0781 Q272.1875,234.0781 271.5,235.1563 Q270.8125,236.2188 270.8125,238.3125 Q270.8125,240.4063 271.5,241.4844 Q272.1875,242.5469 273.5313,242.5469 Q274.1563,242.5469 274.75,242.2813 Q275.3438,242 275.9688,241.4219 L275.9688,244.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="287" y="242.6543">t00057_C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="254.5" y2="254.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="264" y="260.5"/>
       <ellipse cx="269" cy="265.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L12" target="_top" title="c1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L12" xlink:show="new" xlink:title="c1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="39" x="278" y="268.7104">c1 : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="259" x2="348" y1="275.3047" y2="275.3047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="213"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L15" target="_top" title="t00057_D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L15" xlink:show="new" xlink:title="t00057_D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="79.5469" id="C_0000784667124248020371" style="stroke: #A80036; stroke-width: 1.5;" width="92" x="384.5" y="213"/>
       <ellipse cx="399.5" cy="231.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M402.4688,237.6094 Q401.8906,237.9063 401.25,238.0469 Q400.6094,238.2031 399.9063,238.2031 Q397.4063,238.2031 396.0781,236.5625 Q394.7656,234.9063 394.7656,231.7813 Q394.7656,228.6563 396.0781,227 Q397.4063,225.3438 399.9063,225.3438 Q400.6094,225.3438 401.25,225.5 Q401.9063,225.6563 402.4688,225.9531 L402.4688,228.6719 Q401.8438,228.0938 401.25,227.8281 Q400.6563,227.5469 400.0313,227.5469 Q398.6875,227.5469 398,228.625 Q397.3125,229.6875 397.3125,231.7813 Q397.3125,233.875 398,234.9531 Q398.6875,236.0156 400.0313,236.0156 Q400.6563,236.0156 401.25,235.75 Q401.8438,235.4688 402.4688,234.8906 L402.4688,237.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="419" y="229.1387">«union»</text>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="60" x="413.5" y="243.1074">t00057_D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="250.9375" y2="250.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="256.9375"/>
       <ellipse cx="395.5" cy="261.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L16" target="_top" title="d1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L16" xlink:show="new" xlink:title="d1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="40" x="404.5" y="265.1479">d1 : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="390.5" y="269.7422"/>
       <ellipse cx="395.5" cy="274.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L17" target="_top" title="d2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L17" xlink:show="new" xlink:title="d2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="51" x="404.5" y="277.9526">d2 : float</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="385.5" x2="475.5" y1="284.5469" y2="284.5469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="210"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L20" target="_top" title="t00057_E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L20" xlink:show="new" xlink:title="t00057_E" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="86.4141" id="C_0000682873132844345324" style="stroke: #A80036; stroke-width: 1.5;" width="266" x="511.5" y="210"/>
       <ellipse cx="610.75" cy="226" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M613.7188,231.6406 Q613.1406,231.9375 612.5,232.0781 Q611.8594,232.2344 611.1563,232.2344 Q608.6563,232.2344 607.3281,230.5938 Q606.0156,228.9375 606.0156,225.8125 Q606.0156,222.6875 607.3281,221.0313 Q608.6563,219.375 611.1563,219.375 Q611.8594,219.375 612.5,219.5313 Q613.1563,219.6875 613.7188,219.9844 L613.7188,222.7031 Q613.0938,222.125 612.5,221.8594 Q611.9063,221.5781 611.2813,221.5781 Q609.9375,221.5781 609.25,222.6563 Q608.5625,223.7188 608.5625,225.8125 Q608.5625,227.9063 609.25,228.9844 Q609.9375,230.0469 611.2813,230.0469 Q611.9063,230.0469 612.5,229.7813 Q613.0938,229.5 613.7188,228.9219 L613.7188,231.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="631.25" y="230.1543">t00057_E</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="242" y2="242"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="248"/>
       <ellipse cx="522.5" cy="253" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L21" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L21" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="531.5" y="256.2104">e : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="512.5" x2="776.5" y1="262.8047" y2="262.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="268.8047"/>
       <ellipse cx="522.5" cy="273.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L25" target="_top" title="coordinates" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L25" xlink:show="new" xlink:title="coordinates" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="240" x="531.5" y="277.0151">coordinates : t00057_E::(anonymous_739)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="517.5" y="281.6094"/>
       <ellipse cx="522.5" cy="286.6094" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L29" target="_top" title="height" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L29" xlink:show="new" xlink:title="height" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="208" x="531.5" y="289.8198">height : t00057_E::(anonymous_807)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="376"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L22" target="_top" title="t00057_E##(coordinates)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L22" xlink:show="new" xlink:title="t00057_E##(coordinates)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="73.6094" id="C_0000161676142413826748" style="stroke: #A80036; stroke-width: 1.5;" width="184" x="451.5" y="376"/>
       <ellipse cx="466.5" cy="392" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M469.4688,397.6406 Q468.8906,397.9375 468.25,398.0781 Q467.6094,398.2344 466.9063,398.2344 Q464.4063,398.2344 463.0781,396.5938 Q461.7656,394.9375 461.7656,391.8125 Q461.7656,388.6875 463.0781,387.0313 Q464.4063,385.375 466.9063,385.375 Q467.6094,385.375 468.25,385.5313 Q468.9063,385.6875 469.4688,385.9844 L469.4688,388.7031 Q468.8438,388.125 468.25,387.8594 Q467.6563,387.5781 467.0313,387.5781 Q465.6875,387.5781 465,388.6563 Q464.3125,389.7188 464.3125,391.8125 Q464.3125,393.9063 465,394.9844 Q465.6875,396.0469 467.0313,396.0469 Q467.6563,396.0469 468.25,395.7813 Q468.8438,395.5 469.4688,394.9219 L469.4688,397.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="152" x="480.5" y="396.1543">t00057_E::(coordinates)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="408" y2="408"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="414"/>
       <ellipse cx="462.5" cy="419" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L23" target="_top" title="x" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L23" xlink:show="new" xlink:title="x" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="422.2104">x : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="457.5" y="426.8047"/>
       <ellipse cx="462.5" cy="431.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L24" target="_top" title="y" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L24" xlink:show="new" xlink:title="y" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="32" x="471.5" y="435.0151">y : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="452.5" x2="634.5" y1="441.6094" y2="441.6094"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="373"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L26" target="_top" title="t00057_E##(height)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L26" xlink:show="new" xlink:title="t00057_E##(height)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="79.5469" id="C_0002265335931722752750" style="stroke: #A80036; stroke-width: 1.5;" width="149" x="671" y="373"/>
       <ellipse cx="686" cy="391.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M688.9688,397.6094 Q688.3906,397.9063 687.75,398.0469 Q687.1094,398.2031 686.4063,398.2031 Q683.9063,398.2031 682.5781,396.5625 Q681.2656,394.9063 681.2656,391.7813 Q681.2656,388.6563 682.5781,387 Q683.9063,385.3438 686.4063,385.3438 Q687.1094,385.3438 687.75,385.5 Q688.4063,385.6563 688.9688,385.9531 L688.9688,388.6719 Q688.3438,388.0938 687.75,387.8281 Q687.1563,387.5469 686.5313,387.5469 Q685.1875,387.5469 684.5,388.625 Q683.8125,389.6875 683.8125,391.7813 Q683.8125,393.875 684.5,394.9531 Q685.1875,396.0156 686.5313,396.0156 Q687.1563,396.0156 687.75,395.75 Q688.3438,395.4688 688.9688,394.8906 L688.9688,397.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="49" x="734" y="389.1387">«union»</text>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="117" x="700" y="403.1074">t00057_E::(height)</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="410.9375" y2="410.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="416.9375"/>
       <ellipse cx="682" cy="421.9375" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L27" target="_top" title="z" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L27" xlink:show="new" xlink:title="z" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="31" x="691" y="425.1479">z : int</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="677" y="429.7422"/>
       <ellipse cx="682" cy="434.7422" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L28" target="_top" title="t" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L28" xlink:show="new" xlink:title="t" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="54" x="691" y="437.9526">t : double</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="672" x2="819" y1="444.5469" y2="444.5469"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L32" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="124.8281" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="144" x="294.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L32" target="_top" title="t00057_R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L32" xlink:show="new" xlink:title="t00057_R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="124.8281" id="C_0000370583978606928327" style="stroke: #A80036; stroke-width: 1.5;" width="144" x="294.5" y="8"/>
       <ellipse cx="333.35" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M336.3188,29.6406 Q335.7406,29.9375 335.1,30.0781 Q334.4594,30.2344 333.7563,30.2344 Q331.2563,30.2344 329.9281,28.5938 Q328.6156,26.9375 328.6156,23.8125 Q328.6156,20.6875 329.9281,19.0313 Q331.2563,17.375 333.7563,17.375 Q334.4594,17.375 335.1,17.5313 Q335.7563,17.6875 336.3188,17.9844 L336.3188,20.7031 Q335.6938,20.125 335.1,19.8594 Q334.5063,19.5781 333.8813,19.5781 Q332.5375,19.5781 331.85,20.6563 Q331.1625,21.7188 331.1625,23.8125 Q331.1625,25.9063 331.85,26.9844 Q332.5375,28.0469 333.8813,28.0469 Q334.5063,28.0469 335.1,27.7813 Q335.6938,27.5 336.3188,26.9219 L336.3188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="59" x="352.65" y="28.1543">t00057_R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="295.5" x2="437.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L33" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L33" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300.5" y="46"/>
       <ellipse cx="305.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L33" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L33" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L33" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="108" x="314.5" y="54.2104">a : struct t00057_A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300.5" y="58.8047"/>
       <ellipse cx="305.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="314.5" y="67.0151">b : t00057_B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L35" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L35" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L35" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L35" xlink:show="new" xlink:title="c" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300.5" y="71.6094"/>
       <ellipse cx="305.5" cy="76.6094" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L35" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L35" xlink:show="new" xlink:title="c" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L35" target="_top" title="c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L35" xlink:show="new" xlink:title="c" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="314.5" y="79.8198">c : struct t00057_C *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L36" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L36" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="d" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300.5" y="84.4141"/>
       <ellipse cx="305.5" cy="89.4141" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L36" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="d" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L36" target="_top" title="d" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L36" xlink:show="new" xlink:title="d" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="107" x="314.5" y="92.6245">d : union t00057_D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L37" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L37" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="e" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300.5" y="97.2188"/>
       <ellipse cx="305.5" cy="102.2188" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L37" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="e" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L37" target="_top" title="e" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L37" xlink:show="new" xlink:title="e" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="118" x="314.5" y="105.4292">e : struct t00057_E *</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L38" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L38" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="f" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="300.5" y="110.0234"/>
       <ellipse cx="305.5" cy="115.0234" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L38" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="f" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L38" target="_top" title="f" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/t00057.c#L38" xlink:show="new" xlink:title="f" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="114" x="314.5" y="118.2339">f : struct t00057_F *</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="295.5" x2="437.5" y1="124.8281" y2="124.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1tpya34hpw6ls)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="812.5" y="222.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/include/t00057.h#L3" target="_top" title="t00057_F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/include/t00057.h#L3" xlink:show="new" xlink:title="t00057_F" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1ds2z9gwseg86)" height="60.8047" id="C_0000085797106299568719" style="stroke: #A80036; stroke-width: 1.5;" width="90" x="812.5" y="222.5"/>
       <ellipse cx="827.5" cy="238.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M830.4688,244.1406 Q829.8906,244.4375 829.25,244.5781 Q828.6094,244.7344 827.9063,244.7344 Q825.4063,244.7344 824.0781,243.0938 Q822.7656,241.4375 822.7656,238.3125 Q822.7656,235.1875 824.0781,233.5313 Q825.4063,231.875 827.9063,231.875 Q828.6094,231.875 829.25,232.0313 Q829.9063,232.1875 830.4688,232.4844 L830.4688,235.2031 Q829.8438,234.625 829.25,234.3594 Q828.6563,234.0781 828.0313,234.0781 Q826.6875,234.0781 826,235.1563 Q825.3125,236.2188 825.3125,238.3125 Q825.3125,240.4063 826,241.4844 Q826.6875,242.5469 828.0313,242.5469 Q828.6563,242.5469 829.25,242.2813 Q829.8438,242 830.4688,241.4219 L830.4688,244.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="58" x="841.5" y="242.6543">t00057_F</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="901.5" y1="254.5" y2="254.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="818.5" y="260.5"/>
       <ellipse cx="823.5" cy="265.5" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/src/t00057_impl.c#L4" target="_top" title="f1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00057/src/t00057_impl.c#L4" xlink:show="new" xlink:title="f1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="37" x="832.5" y="268.7104">f1 : int</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="813.5" x2="901.5" y1="275.3047" y2="275.3047"/>
diff --git a/docs/test_cases/t00058.md b/docs/test_cases/t00058.md
index 2a967e55..d32cc43b 100644
--- a/docs/test_cases/t00058.md
+++ b/docs/test_cases/t00058.md
@@ -67,3 +67,386 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00058_class](./t00058_class.svg "Test case for concepts with variadic parameters and type aliases")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00058::first_type<T,Args...>",
+      "id": "39461943261269692",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "first_type",
+      "namespace": "clanguml::t00058",
+      "source_location": {
+        "file": "../../tests/t00058/t00058.cc",
+        "line": 11
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Args...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "display_name": "clanguml::t00058::same_as_first_type<T,Args...>",
+      "id": "1725820236573641307",
+      "name": "same_as_first_type",
+      "namespace": "clanguml::t00058",
+      "parameters": [],
+      "source_location": {
+        "file": "../../tests/t00058/t00058.cc",
+        "line": 22
+      },
+      "statements": [],
+      "type": "concept"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00058::A<T,Args...>",
+      "id": "798619347004821702",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "a",
+          "source_location": {
+            "file": "../../tests/t00058/t00058.cc",
+            "line": 28
+          },
+          "type": "std::vector<T>"
+        }
+      ],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00058",
+      "source_location": {
+        "file": "../../tests/t00058/t00058.cc",
+        "line": 27
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Args...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00058::B<T,P,Args...>",
+      "id": "420594889696591405",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "b",
+          "source_location": {
+            "file": "../../tests/t00058/t00058.cc",
+            "line": 34
+          },
+          "type": "std::vector<T>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "bb",
+          "source_location": {
+            "file": "../../tests/t00058/t00058.cc",
+            "line": 35
+          },
+          "type": "P"
+        }
+      ],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00058",
+      "source_location": {
+        "file": "../../tests/t00058/t00058.cc",
+        "line": 33
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "P",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": true,
+          "kind": "template_type",
+          "name": "Args...",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00058::A<int,int,double,std::string>",
+      "id": "1724002183455178980",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00058",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "double"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00058::A<int,int>",
+      "id": "1372381231906520278",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00058",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00058::B<int,std::string,int,double,clanguml::t00058::A<int,int>>",
+      "id": "290383080560130133",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00058",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "std::string"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "int"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "double"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "int"
+            },
+            {
+              "is_variadic": false,
+              "kind": "argument",
+              "template_parameters": [],
+              "type": "int"
+            }
+          ],
+          "type": "clanguml::t00058::A"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00058::R",
+      "id": "1015108159699260009",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "aa",
+          "source_location": {
+            "file": "../../tests/t00058/t00058.cc",
+            "line": 39
+          },
+          "type": "A<int,int,double,std::string>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "bb",
+          "source_location": {
+            "file": "../../tests/t00058/t00058.cc",
+            "line": 40
+          },
+          "type": "B<int,std::string,int,double,A<int,int>>"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00058",
+      "source_location": {
+        "file": "../../tests/t00058/t00058.cc",
+        "line": 38
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00058_class",
+  "relationships": [
+    {
+      "destination": "1725820236573641307",
+      "label": "T,Args...",
+      "source": "798619347004821702",
+      "type": "constraint"
+    },
+    {
+      "destination": "1725820236573641307",
+      "label": "T,Args...",
+      "source": "420594889696591405",
+      "type": "constraint"
+    },
+    {
+      "access": "public",
+      "destination": "798619347004821702",
+      "source": "1724002183455178980",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "798619347004821702",
+      "source": "1372381231906520278",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1372381231906520278",
+      "source": "290383080560130133",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "420594889696591405",
+      "source": "290383080560130133",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "1724002183455178980",
+      "label": "aa",
+      "source": "1015108159699260009",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "290383080560130133",
+      "label": "bb",
+      "source": "1015108159699260009",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00058"
+}
+```
diff --git a/docs/test_cases/t00058_class.svg b/docs/test_cases/t00058_class.svg
index 99b869c8..b079a2dc 100644
--- a/docs/test_cases/t00058_class.svg
+++ b/docs/test_cases/t00058_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="809px" preserveAspectRatio="none" style="width:437px;height:809px;" version="1.1" viewBox="0 0 437 809" width="437px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f31g4l2qdy9b2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fw3n48rfgn7ec" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f31g4l2qdy9b2)" height="48" id="C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="155.5" y="750"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L11" target="_top" title="first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L11" xlink:show="new" xlink:title="first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw3n48rfgn7ec)" height="48" id="C_0000039461943261269692" style="stroke: #A80036; stroke-width: 1.5;" width="143" x="155.5" y="750"/>
       <ellipse cx="170.5" cy="766" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M173.4688,771.6406 Q172.8906,771.9375 172.25,772.0781 Q171.6094,772.2344 170.9063,772.2344 Q168.4063,772.2344 167.0781,770.5938 Q165.7656,768.9375 165.7656,765.8125 Q165.7656,762.6875 167.0781,761.0313 Q168.4063,759.375 170.9063,759.375 Q171.6094,759.375 172.25,759.5313 Q172.9063,759.6875 173.4688,759.9844 L173.4688,762.7031 Q172.8438,762.125 172.25,761.8594 Q171.6563,761.5781 171.0313,761.5781 Q169.6875,761.5781 169,762.6563 Q168.3125,763.7188 168.3125,765.8125 Q168.3125,767.9063 169,768.9844 Q169.6875,770.0469 171.0313,770.0469 Q171.6563,770.0469 172.25,769.7813 Q172.8438,769.5 173.4688,768.9219 L173.4688,771.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="57" x="184.5" y="770.1543">first_type</text>
@@ -19,8 +19,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="782" y2="782"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="156.5" x2="297.5" y1="790" y2="790"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f31g4l2qdy9b2)" height="53.9375" id="C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="125" y="635"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L22" target="_top" title="same_as_first_type" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L22" xlink:show="new" xlink:title="same_as_first_type" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw3n48rfgn7ec)" height="53.9375" id="C_0001725820236573641307" style="stroke: #A80036; stroke-width: 1.5;" width="204" x="125" y="635"/>
       <ellipse cx="140" cy="653.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M142.9688,659.6094 Q142.3906,659.9063 141.75,660.0469 Q141.1094,660.2031 140.4063,660.2031 Q137.9063,660.2031 136.5781,658.5625 Q135.2656,656.9063 135.2656,653.7813 Q135.2656,650.6563 136.5781,649 Q137.9063,647.3438 140.4063,647.3438 Q141.1094,647.3438 141.75,647.5 Q142.4063,647.6563 142.9688,647.9531 L142.9688,650.6719 Q142.3438,650.0938 141.75,649.8281 Q141.1563,649.5469 140.5313,649.5469 Q139.1875,649.5469 138.5,650.625 Q137.8125,651.6875 137.8125,653.7813 Q137.8125,655.875 138.5,656.9531 Q139.1875,658.0156 140.5313,658.0156 Q141.1563,658.0156 141.75,657.75 Q142.3438,657.4688 142.9688,656.8906 L142.9688,659.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="180.5" y="651.1387">«concept»</text>
@@ -30,8 +30,8 @@
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="672.9375" y2="672.9375"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="126" x2="328" y1="680.9375" y2="680.9375"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f31g4l2qdy9b2)" height="60.8047" id="C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="93.5" y="497"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L27" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L27" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw3n48rfgn7ec)" height="60.8047" id="C_0000798619347004821702" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="93.5" y="497"/>
       <ellipse cx="125.15" cy="513" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M128.1188,518.6406 Q127.5406,518.9375 126.9,519.0781 Q126.2594,519.2344 125.5563,519.2344 Q123.0563,519.2344 121.7281,517.5938 Q120.4156,515.9375 120.4156,512.8125 Q120.4156,509.6875 121.7281,508.0313 Q123.0563,506.375 125.5563,506.375 Q126.2594,506.375 126.9,506.5313 Q127.5563,506.6875 128.1188,506.9844 L128.1188,509.7031 Q127.4938,509.125 126.9,508.8594 Q126.3063,508.5781 125.6813,508.5781 Q124.3375,508.5781 123.65,509.6563 Q122.9625,510.7188 122.9625,512.8125 Q122.9625,514.9063 123.65,515.9844 Q124.3375,517.0469 125.6813,517.0469 Q126.3063,517.0469 126.9,516.7813 Q127.4938,516.5 128.1188,515.9219 L128.1188,518.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="142.85" y="517.1543">A</text>
@@ -39,16 +39,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="50" x="176.5" y="506.1387">T,Args...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="529" y2="529"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="99.5" y="535"/>
       <ellipse cx="104.5" cy="540" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L28" target="_top" title="a" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L28" xlink:show="new" xlink:title="a" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="113.5" y="543.2104">a : std::vector&lt;T&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="94.5" x2="223.5" y1="549.8047" y2="549.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f31g4l2qdy9b2)" height="73.6094" id="C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="229.5" y="393"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L33" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L33" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw3n48rfgn7ec)" height="73.6094" id="C_0000420594889696591405" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="229.5" y="393"/>
       <ellipse cx="256.2" cy="409" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M259.1688,414.6406 Q258.5906,414.9375 257.95,415.0781 Q257.3094,415.2344 256.6063,415.2344 Q254.1063,415.2344 252.7781,413.5938 Q251.4656,411.9375 251.4656,408.8125 Q251.4656,405.6875 252.7781,404.0313 Q254.1063,402.375 256.6063,402.375 Q257.3094,402.375 257.95,402.5313 Q258.6063,402.6875 259.1688,402.9844 L259.1688,405.7031 Q258.5438,405.125 257.95,404.8594 Q257.3563,404.5781 256.7313,404.5781 Q255.3875,404.5781 254.7,405.6563 Q254.0125,406.7188 254.0125,408.8125 Q254.0125,410.9063 254.7,411.9844 Q255.3875,413.0469 256.7313,413.0469 Q257.3563,413.0469 257.95,412.7813 Q258.5438,412.5 259.1688,411.9219 L259.1688,414.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="272.8" y="413.1543">B</text>
@@ -56,22 +56,22 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="61" x="301.5" y="402.1387">T,P,Args...</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="425" y2="425"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="431"/>
       <ellipse cx="240.5" cy="436" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L34" target="_top" title="b" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L34" xlink:show="new" xlink:title="b" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="105" x="249.5" y="439.2104">b : std::vector&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="235.5" y="443.8047"/>
       <ellipse cx="240.5" cy="448.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L35" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L35" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="249.5" y="452.0151">bb : P</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="230.5" x2="359.5" y1="458.6094" y2="458.6094"/>
-    <rect fill="#FEFECE" filter="url(#f31g4l2qdy9b2)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
+    <rect fill="#FEFECE" filter="url(#fw3n48rfgn7ec)" height="48" id="C_0001724002183455178980" style="stroke: #A80036; stroke-width: 1.5;" width="193" x="12.5" y="237"/>
     <ellipse cx="27.5" cy="253" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M30.4688,258.6406 Q29.8906,258.9375 29.25,259.0781 Q28.6094,259.2344 27.9063,259.2344 Q25.4063,259.2344 24.0781,257.5938 Q22.7656,255.9375 22.7656,252.8125 Q22.7656,249.6875 24.0781,248.0313 Q25.4063,246.375 27.9063,246.375 Q28.6094,246.375 29.25,246.5313 Q29.9063,246.6875 30.4688,246.9844 L30.4688,249.7031 Q29.8438,249.125 29.25,248.8594 Q28.6563,248.5781 28.0313,248.5781 Q26.6875,248.5781 26,249.6563 Q25.3125,250.7188 25.3125,252.8125 Q25.3125,254.9063 26,255.9844 Q26.6875,257.0469 28.0313,257.0469 Q28.6563,257.0469 29.25,256.7813 Q29.8438,256.5 30.4688,255.9219 L30.4688,258.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="41.5" y="257.1543">A</text>
@@ -79,7 +79,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="149" x="58.5" y="246.1387">int,int,double,std::string</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="269" y2="269"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="13.5" x2="204.5" y1="277" y2="277"/>
-    <rect fill="#FEFECE" filter="url(#f31g4l2qdy9b2)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
+    <rect fill="#FEFECE" filter="url(#fw3n48rfgn7ec)" height="48" id="C_0001372381231906520278" style="stroke: #A80036; stroke-width: 1.5;" width="80" x="162" y="315"/>
     <ellipse cx="177" cy="331" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M179.9688,336.6406 Q179.3906,336.9375 178.75,337.0781 Q178.1094,337.2344 177.4063,337.2344 Q174.9063,337.2344 173.5781,335.5938 Q172.2656,333.9375 172.2656,330.8125 Q172.2656,327.6875 173.5781,326.0313 Q174.9063,324.375 177.4063,324.375 Q178.1094,324.375 178.75,324.5313 Q179.4063,324.6875 179.9688,324.9844 L179.9688,327.7031 Q179.3438,327.125 178.75,326.8594 Q178.1563,326.5781 177.5313,326.5781 Q176.1875,326.5781 175.5,327.6563 Q174.8125,328.7188 174.8125,330.8125 Q174.8125,332.9063 175.5,333.9844 Q176.1875,335.0469 177.5313,335.0469 Q178.1563,335.0469 178.75,334.7813 Q179.3438,334.5 179.9688,333.9219 L179.9688,336.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191" y="335.1543">A</text>
@@ -87,7 +87,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="36" x="208" y="324.1387">int,int</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="347" y2="347"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="163" x2="241" y1="355" y2="355"/>
-    <rect fill="#FEFECE" filter="url(#f31g4l2qdy9b2)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
+    <rect fill="#FEFECE" filter="url(#fw3n48rfgn7ec)" height="48" id="C_0000290383080560130133" style="stroke: #A80036; stroke-width: 1.5;" width="261" x="162.5" y="159"/>
     <ellipse cx="177.5" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M180.4688,180.6406 Q179.8906,180.9375 179.25,181.0781 Q178.6094,181.2344 177.9063,181.2344 Q175.4063,181.2344 174.0781,179.5938 Q172.7656,177.9375 172.7656,174.8125 Q172.7656,171.6875 174.0781,170.0313 Q175.4063,168.375 177.9063,168.375 Q178.6094,168.375 179.25,168.5313 Q179.9063,168.6875 180.4688,168.9844 L180.4688,171.7031 Q179.8438,171.125 179.25,170.8594 Q178.6563,170.5781 178.0313,170.5781 Q176.6875,170.5781 176,171.6563 Q175.3125,172.7188 175.3125,174.8125 Q175.3125,176.9063 176,177.9844 Q176.6875,179.0469 178.0313,179.0469 Q178.6563,179.0469 179.25,178.7813 Q179.8438,178.5 180.4688,177.9219 L180.4688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="191.5" y="179.1543">B</text>
@@ -95,25 +95,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="217" x="208.5" y="168.1387">int,std::string,int,double,A&lt;int,int&gt;</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="163.5" x2="422.5" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f31g4l2qdy9b2)" height="73.6094" id="C_0001015108159699260009" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="6" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L38" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L38" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fw3n48rfgn7ec)" height="73.6094" id="C_0001015108159699260009" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="6" y="8"/>
       <ellipse cx="135.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M138.7188,29.6406 Q138.1406,29.9375 137.5,30.0781 Q136.8594,30.2344 136.1563,30.2344 Q133.6563,30.2344 132.3281,28.5938 Q131.0156,26.9375 131.0156,23.8125 Q131.0156,20.6875 132.3281,19.0313 Q133.6563,17.375 136.1563,17.375 Q136.8594,17.375 137.5,17.5313 Q138.1563,17.6875 138.7188,17.9844 L138.7188,20.7031 Q138.0938,20.125 137.5,19.8594 Q136.9063,19.5781 136.2813,19.5781 Q134.9375,19.5781 134.25,20.6563 Q133.5625,21.7188 133.5625,23.8125 Q133.5625,25.9063 134.25,26.9844 Q134.9375,28.0469 136.2813,28.0469 Q136.9063,28.0469 137.5,27.7813 Q138.0938,27.5 138.7188,26.9219 L138.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="156.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="46"/>
       <ellipse cx="17" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L39" target="_top" title="aa" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L39" xlink:show="new" xlink:title="aa" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="188" x="26" y="54.2104">aa : A&lt;int,int,double,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="12" y="58.8047"/>
       <ellipse cx="17" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L40" target="_top" title="bb" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00058/t00058.cc#L40" xlink:show="new" xlink:title="bb" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="250" x="26" y="67.0151">bb : B&lt;int,std::string,int,double,A&lt;int,int&gt;&gt;</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="281" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00059.md b/docs/test_cases/t00059.md
index aedaf7fa..1cb7b46c 100644
--- a/docs/test_cases/t00059.md
+++ b/docs/test_cases/t00059.md
@@ -76,3 +76,487 @@ struct R {
 ```
 ## Generated UML diagrams
 ![t00059_class](./t00059_class.svg "Non-virtual abstract factory pattern using concepts test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "display_name": "clanguml::t00059::fruit_c<T>",
+      "id": "1926201868069460340",
+      "name": "fruit_c",
+      "namespace": "clanguml::t00059",
+      "parameters": [
+        {
+          "name": "clanguml::t00059::t",
+          "type": "T"
+        }
+      ],
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 7
+      },
+      "statements": [
+        "T{}",
+        "t.get_name()"
+      ],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00059::apple_c<T>",
+      "id": "1932582371736186409",
+      "name": "apple_c",
+      "namespace": "clanguml::t00059",
+      "parameters": [
+        {
+          "name": "clanguml::t00059::t",
+          "type": "T"
+        }
+      ],
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 13
+      },
+      "statements": [
+        "t.get_sweetness()"
+      ],
+      "type": "concept"
+    },
+    {
+      "display_name": "clanguml::t00059::orange_c<T>",
+      "id": "1483904441065806133",
+      "name": "orange_c",
+      "namespace": "clanguml::t00059",
+      "parameters": [
+        {
+          "name": "clanguml::t00059::t",
+          "type": "T"
+        }
+      ],
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 16
+      },
+      "statements": [
+        "t.get_bitterness()"
+      ],
+      "type": "concept"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00059::gala_apple",
+      "id": "399997161214328320",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_name",
+          "parameters": [],
+          "type": "std::string"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_sweetness",
+          "parameters": [],
+          "type": "float"
+        }
+      ],
+      "name": "gala_apple",
+      "namespace": "clanguml::t00059",
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 18
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00059::empire_apple",
+      "id": "660406972347773654",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_name",
+          "parameters": [],
+          "type": "std::string"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_sweetness",
+          "parameters": [],
+          "type": "float"
+        }
+      ],
+      "name": "empire_apple",
+      "namespace": "clanguml::t00059",
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 24
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00059::lima_orange",
+      "id": "1649295452510454080",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_name",
+          "parameters": [],
+          "type": "std::string"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_bitterness",
+          "parameters": [],
+          "type": "float"
+        }
+      ],
+      "name": "lima_orange",
+      "namespace": "clanguml::t00059",
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 30
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00059::valencia_orange",
+      "id": "802727760415733923",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_name",
+          "parameters": [],
+          "type": "std::string"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "get_bitterness",
+          "parameters": [],
+          "type": "float"
+        }
+      ],
+      "name": "valencia_orange",
+      "namespace": "clanguml::t00059",
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 36
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00059::fruit_factory<clanguml::t00059::apple_c TA,clanguml::t00059::orange_c TO>",
+      "id": "2301786483822933456",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": true,
+      "is_union": false,
+      "members": [],
+      "methods": [
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "create_apple",
+          "parameters": [],
+          "type": "TA"
+        },
+        {
+          "access": "public",
+          "is_const": true,
+          "is_defaulted": false,
+          "is_implicit": false,
+          "is_pure_virtual": false,
+          "is_static": false,
+          "is_virtual": false,
+          "name": "create_orange",
+          "parameters": [],
+          "type": "TO"
+        }
+      ],
+      "name": "fruit_factory",
+      "namespace": "clanguml::t00059",
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 42
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "TA",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "TO",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00059::fruit_factory<clanguml::t00059::gala_apple,clanguml::t00059::valencia_orange>",
+      "id": "551278102444647278",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "fruit_factory",
+      "namespace": "clanguml::t00059",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00059::gala_apple"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00059::valencia_orange"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00059::fruit_factory<clanguml::t00059::empire_apple,clanguml::t00059::lima_orange>",
+      "id": "536390279563541226",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": false,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "fruit_factory",
+      "namespace": "clanguml::t00059",
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00059::empire_apple"
+        },
+        {
+          "is_variadic": false,
+          "kind": "argument",
+          "template_parameters": [],
+          "type": "clanguml::t00059::lima_orange"
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00059::R",
+      "id": "1128300671453354325",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "factory_1",
+          "source_location": {
+            "file": "../../tests/t00059/t00059.cc",
+            "line": 52
+          },
+          "type": "clanguml::t00059::fruit_factory_1"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "factory_2",
+          "source_location": {
+            "file": "../../tests/t00059/t00059.cc",
+            "line": 53
+          },
+          "type": "clanguml::t00059::fruit_factory_2"
+        }
+      ],
+      "methods": [],
+      "name": "R",
+      "namespace": "clanguml::t00059",
+      "source_location": {
+        "file": "../../tests/t00059/t00059.cc",
+        "line": 51
+      },
+      "template_parameters": [],
+      "type": "class"
+    }
+  ],
+  "name": "t00059_class",
+  "relationships": [
+    {
+      "destination": "1926201868069460340",
+      "label": "T",
+      "source": "1932582371736186409",
+      "type": "constraint"
+    },
+    {
+      "destination": "1926201868069460340",
+      "label": "T",
+      "source": "1483904441065806133",
+      "type": "constraint"
+    },
+    {
+      "destination": "1932582371736186409",
+      "label": "TA",
+      "source": "2301786483822933456",
+      "type": "constraint"
+    },
+    {
+      "destination": "1483904441065806133",
+      "label": "TO",
+      "source": "2301786483822933456",
+      "type": "constraint"
+    },
+    {
+      "access": "public",
+      "destination": "399997161214328320",
+      "source": "551278102444647278",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "802727760415733923",
+      "source": "551278102444647278",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2301786483822933456",
+      "source": "551278102444647278",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "660406972347773654",
+      "source": "536390279563541226",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1649295452510454080",
+      "source": "536390279563541226",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "2301786483822933456",
+      "source": "536390279563541226",
+      "type": "instantiation"
+    },
+    {
+      "access": "public",
+      "destination": "551278102444647278",
+      "label": "factory_1",
+      "source": "1128300671453354325",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "536390279563541226",
+      "label": "factory_2",
+      "source": "1128300671453354325",
+      "type": "aggregation"
+    }
+  ],
+  "using_namespace": "clanguml::t00059"
+}
+```
diff --git a/docs/test_cases/t00059_class.svg b/docs/test_cases/t00059_class.svg
index c784af76..8059e4aa 100644
--- a/docs/test_cases/t00059_class.svg
+++ b/docs/test_cases/t00059_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="679px" preserveAspectRatio="none" style="width:1199px;height:679px;" version="1.1" viewBox="0 0 1199 679" width="1199px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fuck53148x69e" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f8bpyotpjzg3j" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,8 +9,8 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="534" y="576"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L7" target="_top" title="fruit_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L7" xlink:show="new" xlink:title="fruit_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="92.3516" id="C_0001926201868069460340" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="534" y="576"/>
       <ellipse cx="549" cy="594.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M551.9688,600.6094 Q551.3906,600.9063 550.75,601.0469 Q550.1094,601.2031 549.4063,601.2031 Q546.9063,601.2031 545.5781,599.5625 Q544.2656,597.9063 544.2656,594.7813 Q544.2656,591.6563 545.5781,590 Q546.9063,588.3438 549.4063,588.3438 Q550.1094,588.3438 550.75,588.5 Q551.4063,588.6563 551.9688,588.9531 L551.9688,591.6719 Q551.3438,591.0938 550.75,590.8281 Q550.1563,590.5469 549.5313,590.5469 Q548.1875,590.5469 547.5,591.625 Q546.8125,592.6875 546.8125,594.7813 Q546.8125,596.875 547.5,597.9531 Q548.1875,599.0156 549.5313,599.0156 Q550.1563,599.0156 550.75,598.75 Q551.3438,598.4688 551.9688,597.8906 L551.9688,600.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="561" y="592.1387">«concept»</text>
@@ -23,8 +23,8 @@
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="21" x="540" y="648.9526">T{}</text>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="72" x="540" y="661.7573">t.get_name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="456" y="419"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L13" target="_top" title="apple_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L13" xlink:show="new" xlink:title="apple_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="79.5469" id="C_0001932582371736186409" style="stroke: #A80036; stroke-width: 1.5;" width="114" x="456" y="419"/>
       <ellipse cx="475.5" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M478.4688,443.6094 Q477.8906,443.9063 477.25,444.0469 Q476.6094,444.2031 475.9063,444.2031 Q473.4063,444.2031 472.0781,442.5625 Q470.7656,440.9063 470.7656,437.7813 Q470.7656,434.6563 472.0781,433 Q473.4063,431.3438 475.9063,431.3438 Q476.6094,431.3438 477.25,431.5 Q477.9063,431.6563 478.4688,431.9531 L478.4688,434.6719 Q477.8438,434.0938 477.25,433.8281 Q476.6563,433.5469 476.0313,433.5469 Q474.6875,433.5469 474,434.625 Q473.3125,435.6875 473.3125,437.7813 Q473.3125,439.875 474,440.9531 Q474.6875,442.0156 476.0313,442.0156 Q476.6563,442.0156 477.25,441.75 Q477.8438,441.4688 478.4688,440.8906 L478.4688,443.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="488.5" y="435.1387">«concept»</text>
@@ -36,8 +36,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="457" x2="569" y1="477.7422" y2="477.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="102" x="462" y="491.9526">t.get_sweetness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="605" y="419"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L16" target="_top" title="orange_c" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L16" xlink:show="new" xlink:title="orange_c" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="79.5469" id="C_0001483904441065806133" style="stroke: #A80036; stroke-width: 1.5;" width="110" x="605" y="419"/>
       <ellipse cx="622.7" cy="437.9688" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M625.6688,443.6094 Q625.0906,443.9063 624.45,444.0469 Q623.8094,444.2031 623.1063,444.2031 Q620.6063,444.2031 619.2781,442.5625 Q617.9656,440.9063 617.9656,437.7813 Q617.9656,434.6563 619.2781,433 Q620.6063,431.3438 623.1063,431.3438 Q623.8094,431.3438 624.45,431.5 Q625.1063,431.6563 625.6688,431.9531 L625.6688,434.6719 Q625.0438,434.0938 624.45,433.8281 Q623.8563,433.5469 623.2313,433.5469 Q621.8875,433.5469 621.2,434.625 Q620.5125,435.6875 620.5125,437.7813 Q620.5125,439.875 621.2,440.9531 Q621.8875,442.0156 623.2313,442.0156 Q623.8563,442.0156 624.45,441.75 Q625.0438,441.4688 625.6688,440.8906 L625.6688,443.6094 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="65" x="635.3" y="435.1387">«concept»</text>
@@ -49,8 +49,8 @@
       <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 1.0,2.0;" x1="606" x2="714" y1="477.7422" y2="477.7422"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="98" x="611" y="491.9526">t.get_bitterness()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L18" target="_top" title="gala_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L18" xlink:show="new" xlink:title="gala_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="73.6094" id="C_0000399997161214328320" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="6" y="268"/>
       <ellipse cx="65.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M68.7188,289.6406 Q68.1406,289.9375 67.5,290.0781 Q66.8594,290.2344 66.1563,290.2344 Q63.6563,290.2344 62.3281,288.5938 Q61.0156,286.9375 61.0156,283.8125 Q61.0156,280.6875 62.3281,279.0313 Q63.6563,277.375 66.1563,277.375 Q66.8594,277.375 67.5,277.5313 Q68.1563,277.6875 68.7188,277.9844 L68.7188,280.7031 Q68.0938,280.125 67.5,279.8594 Q66.9063,279.5781 66.2813,279.5781 Q64.9375,279.5781 64.25,280.6563 Q63.5625,281.7188 63.5625,283.8125 Q63.5625,285.9063 64.25,286.9844 Q64.9375,288.0469 66.2813,288.0469 Q66.9063,288.0469 67.5,287.7813 Q68.0938,287.5 68.7188,286.9219 L68.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="68" x="86.25" y="288.1543">gala_apple</text>
@@ -61,8 +61,8 @@
       <ellipse cx="17" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="26" y="335.0151">get_sweetness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L24" target="_top" title="empire_apple" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L24" xlink:show="new" xlink:title="empire_apple" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="73.6094" id="C_0000660406972347773654" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="761" y="268"/>
       <ellipse cx="812.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M815.7188,289.6406 Q815.1406,289.9375 814.5,290.0781 Q813.8594,290.2344 813.1563,290.2344 Q810.6563,290.2344 809.3281,288.5938 Q808.0156,286.9375 808.0156,283.8125 Q808.0156,280.6875 809.3281,279.0313 Q810.6563,277.375 813.1563,277.375 Q813.8594,277.375 814.5,277.5313 Q815.1563,277.6875 815.7188,277.9844 L815.7188,280.7031 Q815.0938,280.125 814.5,279.8594 Q813.9063,279.5781 813.2813,279.5781 Q811.9375,279.5781 811.25,280.6563 Q810.5625,281.7188 810.5625,283.8125 Q810.5625,285.9063 811.25,286.9844 Q811.9375,288.0469 813.2813,288.0469 Q813.9063,288.0469 814.5,287.7813 Q815.0938,287.5 815.7188,286.9219 L815.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="84" x="833.25" y="288.1543">empire_apple</text>
@@ -73,8 +73,8 @@
       <ellipse cx="772" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="166" x="781" y="335.0151">get_sweetness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L30" target="_top" title="lima_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L30" xlink:show="new" xlink:title="lima_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="73.6094" id="C_0001649295452510454080" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="992" y="268"/>
       <ellipse cx="1047.75" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M1050.7188,289.6406 Q1050.1406,289.9375 1049.5,290.0781 Q1048.8594,290.2344 1048.1563,290.2344 Q1045.6563,290.2344 1044.3281,288.5938 Q1043.0156,286.9375 1043.0156,283.8125 Q1043.0156,280.6875 1044.3281,279.0313 Q1045.6563,277.375 1048.1563,277.375 Q1048.8594,277.375 1049.5,277.5313 Q1050.1563,277.6875 1050.7188,277.9844 L1050.7188,280.7031 Q1050.0938,280.125 1049.5,279.8594 Q1048.9063,279.5781 1048.2813,279.5781 Q1046.9375,279.5781 1046.25,280.6563 Q1045.5625,281.7188 1045.5625,283.8125 Q1045.5625,285.9063 1046.25,286.9844 Q1046.9375,288.0469 1048.2813,288.0469 Q1048.9063,288.0469 1049.5,287.7813 Q1050.0938,287.5 1050.7188,286.9219 L1050.7188,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="76" x="1068.25" y="288.1543">lima_orange</text>
@@ -85,8 +85,8 @@
       <ellipse cx="1003" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="1012" y="335.0151">get_bitterness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L36" target="_top" title="valencia_orange" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L36" xlink:show="new" xlink:title="valencia_orange" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="73.6094" id="C_0000802727760415733923" style="stroke: #A80036; stroke-width: 1.5;" width="196" x="237" y="268"/>
       <ellipse cx="279.9" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M282.8688,289.6406 Q282.2906,289.9375 281.65,290.0781 Q281.0094,290.2344 280.3063,290.2344 Q277.8063,290.2344 276.4781,288.5938 Q275.1656,286.9375 275.1656,283.8125 Q275.1656,280.6875 276.4781,279.0313 Q277.8063,277.375 280.3063,277.375 Q281.0094,277.375 281.65,277.5313 Q282.3063,277.6875 282.8688,277.9844 L282.8688,280.7031 Q282.2438,280.125 281.65,279.8594 Q281.0563,279.5781 280.4313,279.5781 Q279.0875,279.5781 278.4,280.6563 Q277.7125,281.7188 277.7125,283.8125 Q277.7125,285.9063 278.4,286.9844 Q279.0875,288.0469 280.4313,288.0469 Q281.0563,288.0469 281.65,287.7813 Q282.2438,287.5 282.8688,286.9219 L282.8688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="102" x="300.1" y="288.1543">valencia_orange</text>
@@ -97,8 +97,8 @@
       <ellipse cx="248" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="162" x="257" y="335.0151">get_bitterness() const : float</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="268"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L42" target="_top" title="fruit_factory" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L42" xlink:show="new" xlink:title="fruit_factory" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="73.6094" id="C_0002301786483822933456" style="stroke: #A80036; stroke-width: 1.5;" width="258" x="468" y="268"/>
       <ellipse cx="483" cy="284" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M485.9688,289.6406 Q485.3906,289.9375 484.75,290.0781 Q484.1094,290.2344 483.4063,290.2344 Q480.9063,290.2344 479.5781,288.5938 Q478.2656,286.9375 478.2656,283.8125 Q478.2656,280.6875 479.5781,279.0313 Q480.9063,277.375 483.4063,277.375 Q484.1094,277.375 484.75,277.5313 Q485.4063,277.6875 485.9688,277.9844 L485.9688,280.7031 Q485.3438,280.125 484.75,279.8594 Q484.1563,279.5781 483.5313,279.5781 Q482.1875,279.5781 481.5,280.6563 Q480.8125,281.7188 480.8125,283.8125 Q480.8125,285.9063 481.5,286.9844 Q482.1875,288.0469 483.5313,288.0469 Q484.1563,288.0469 484.75,287.7813 Q485.3438,287.5 485.9688,286.9219 L485.9688,289.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="497" y="288.1543">fruit_factory</text>
@@ -111,7 +111,7 @@
       <ellipse cx="479" cy="331.8047" fill="#84BE84" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="153" x="488" y="335.0151">create_orange() const : TO</text>
     </a>
-    <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="257" y="159"/>
+    <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="48" id="C_0000551278102444647278" style="stroke: #A80036; stroke-width: 1.5;" width="284" x="257" y="159"/>
     <ellipse cx="272" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M274.9688,180.6406 Q274.3906,180.9375 273.75,181.0781 Q273.1094,181.2344 272.4063,181.2344 Q269.9063,181.2344 268.5781,179.5938 Q267.2656,177.9375 267.2656,174.8125 Q267.2656,171.6875 268.5781,170.0313 Q269.9063,168.375 272.4063,168.375 Q273.1094,168.375 273.75,168.5313 Q274.4063,168.6875 274.9688,168.9844 L274.9688,171.7031 Q274.3438,171.125 273.75,170.8594 Q273.1563,170.5781 272.5313,170.5781 Q271.1875,170.5781 270.5,171.6563 Q269.8125,172.7188 269.8125,174.8125 Q269.8125,176.9063 270.5,177.9844 Q271.1875,179.0469 272.5313,179.0469 Q273.1563,179.0469 273.75,178.7813 Q274.3438,178.5 274.9688,177.9219 L274.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="286" y="179.1543">fruit_factory</text>
@@ -119,7 +119,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="174" x="369" y="168.1387">gala_apple,valencia_orange</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="258" x2="540" y1="199" y2="199"/>
-    <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="673" y="159"/>
+    <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="48" id="C_0000536390279563541226" style="stroke: #A80036; stroke-width: 1.5;" width="274" x="673" y="159"/>
     <ellipse cx="688" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M690.9688,180.6406 Q690.3906,180.9375 689.75,181.0781 Q689.1094,181.2344 688.4063,181.2344 Q685.9063,181.2344 684.5781,179.5938 Q683.2656,177.9375 683.2656,174.8125 Q683.2656,171.6875 684.5781,170.0313 Q685.9063,168.375 688.4063,168.375 Q689.1094,168.375 689.75,168.5313 Q690.4063,168.6875 690.9688,168.9844 L690.9688,171.7031 Q690.3438,171.125 689.75,170.8594 Q689.1563,170.5781 688.5313,170.5781 Q687.1875,170.5781 686.5,171.6563 Q685.8125,172.7188 685.8125,174.8125 Q685.8125,176.9063 686.5,177.9844 Q687.1875,179.0469 688.5313,179.0469 Q689.1563,179.0469 689.75,178.7813 Q690.3438,178.5 690.9688,177.9219 L690.9688,180.6406 Z "/>
     <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="74" x="702" y="179.1543">fruit_factory</text>
@@ -127,25 +127,25 @@
     <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="164" x="785" y="168.1387">empire_apple,lima_orange</text>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="191" y2="191"/>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="674" x2="946" y1="199" y2="199"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fuck53148x69e)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="469.5" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L51" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L51" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f8bpyotpjzg3j)" height="73.6094" id="C_0001128300671453354325" style="stroke: #A80036; stroke-width: 1.5;" width="171" x="469.5" y="8"/>
       <ellipse cx="546.75" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M549.7188,29.6406 Q549.1406,29.9375 548.5,30.0781 Q547.8594,30.2344 547.1563,30.2344 Q544.6563,30.2344 543.3281,28.5938 Q542.0156,26.9375 542.0156,23.8125 Q542.0156,20.6875 543.3281,19.0313 Q544.6563,17.375 547.1563,17.375 Q547.8594,17.375 548.5,17.5313 Q549.1563,17.6875 549.7188,17.9844 L549.7188,20.7031 Q549.0938,20.125 548.5,19.8594 Q547.9063,19.5781 547.2813,19.5781 Q545.9375,19.5781 545.25,20.6563 Q544.5625,21.7188 544.5625,23.8125 Q544.5625,25.9063 545.25,26.9844 Q545.9375,28.0469 547.2813,28.0469 Q547.9063,28.0469 548.5,27.7813 Q549.0938,27.5 549.7188,26.9219 L549.7188,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="567.25" y="28.1543">R</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="46"/>
       <ellipse cx="480.5" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L52" target="_top" title="factory_1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L52" xlink:show="new" xlink:title="factory_1" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="54.2104">factory_1 : fruit_factory_1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="475.5" y="58.8047"/>
       <ellipse cx="480.5" cy="63.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L53" target="_top" title="factory_2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00059/t00059.cc#L53" xlink:show="new" xlink:title="factory_2" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="145" x="489.5" y="67.0151">factory_2 : fruit_factory_2</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="470.5" x2="639.5" y1="73.6094" y2="73.6094"/>
diff --git a/docs/test_cases/t00060.md b/docs/test_cases/t00060.md
index a2ebd074..f5fddcb4 100644
--- a/docs/test_cases/t00060.md
+++ b/docs/test_cases/t00060.md
@@ -43,3 +43,258 @@ template <typename T, typename P> struct H : public G<T> {
 ```
 ## Generated UML diagrams
 ![t00060_class](./t00060_class.svg "Parents (base classes) diagram filter test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "class",
+  "elements": [
+    {
+      "bases": [],
+      "display_name": "clanguml::t00060::A",
+      "id": "1373615549846303472",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "A",
+      "namespace": "clanguml::t00060",
+      "source_location": {
+        "file": "../../tests/t00060/t00060.cc",
+        "line": 3
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1373615549846303472",
+          "is_virtual": false,
+          "name": "clanguml::t00060::A"
+        }
+      ],
+      "display_name": "clanguml::t00060::B",
+      "id": "479650368930934571",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "B",
+      "namespace": "clanguml::t00060",
+      "source_location": {
+        "file": "../../tests/t00060/t00060.cc",
+        "line": 4
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1373615549846303472",
+          "is_virtual": false,
+          "name": "clanguml::t00060::A"
+        }
+      ],
+      "display_name": "clanguml::t00060::C",
+      "id": "1827660844127264787",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "C",
+      "namespace": "clanguml::t00060",
+      "source_location": {
+        "file": "../../tests/t00060/t00060.cc",
+        "line": 5
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "479650368930934571",
+          "is_virtual": false,
+          "name": "clanguml::t00060::B"
+        },
+        {
+          "access": "public",
+          "id": "1827660844127264787",
+          "is_virtual": false,
+          "name": "clanguml::t00060::C"
+        }
+      ],
+      "display_name": "clanguml::t00060::D",
+      "id": "1629687372290281981",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": false,
+      "is_union": false,
+      "members": [],
+      "methods": [],
+      "name": "D",
+      "namespace": "clanguml::t00060",
+      "source_location": {
+        "file": "../../tests/t00060/t00060.cc",
+        "line": 6
+      },
+      "template_parameters": [],
+      "type": "class"
+    },
+    {
+      "bases": [],
+      "display_name": "clanguml::t00060::G<T>",
+      "id": "1877304825033069517",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "g",
+          "source_location": {
+            "file": "../../tests/t00060/t00060.cc",
+            "line": 11
+          },
+          "type": "T"
+        }
+      ],
+      "methods": [],
+      "name": "G",
+      "namespace": "clanguml::t00060",
+      "source_location": {
+        "file": "../../tests/t00060/t00060.cc",
+        "line": 10
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    },
+    {
+      "bases": [
+        {
+          "access": "public",
+          "id": "1877304825033069517",
+          "is_virtual": false,
+          "name": "G<T>"
+        }
+      ],
+      "display_name": "clanguml::t00060::H<T,P>",
+      "id": "1881610349123495638",
+      "is_abstract": false,
+      "is_nested": false,
+      "is_struct": true,
+      "is_template": true,
+      "is_union": false,
+      "members": [
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "h",
+          "source_location": {
+            "file": "../../tests/t00060/t00060.cc",
+            "line": 15
+          },
+          "type": "G<T>"
+        },
+        {
+          "access": "public",
+          "is_static": false,
+          "name": "hh",
+          "source_location": {
+            "file": "../../tests/t00060/t00060.cc",
+            "line": 16
+          },
+          "type": "P"
+        }
+      ],
+      "methods": [],
+      "name": "H",
+      "namespace": "clanguml::t00060",
+      "source_location": {
+        "file": "../../tests/t00060/t00060.cc",
+        "line": 14
+      },
+      "template_parameters": [
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "T",
+          "template_parameters": []
+        },
+        {
+          "is_variadic": false,
+          "kind": "template_type",
+          "name": "P",
+          "template_parameters": []
+        }
+      ],
+      "type": "class"
+    }
+  ],
+  "name": "t00060_class",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1373615549846303472",
+      "source": "479650368930934571",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1373615549846303472",
+      "source": "1827660844127264787",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "479650368930934571",
+      "source": "1629687372290281981",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1827660844127264787",
+      "source": "1629687372290281981",
+      "type": "extension"
+    },
+    {
+      "access": "public",
+      "destination": "1877304825033069517",
+      "label": "h",
+      "source": "1881610349123495638",
+      "type": "aggregation"
+    },
+    {
+      "access": "public",
+      "destination": "1877304825033069517",
+      "source": "1881610349123495638",
+      "type": "extension"
+    }
+  ],
+  "using_namespace": "clanguml::t00060"
+}
+```
diff --git a/docs/test_cases/t00060_class.svg b/docs/test_cases/t00060_class.svg
index ce46cf35..187676ce 100644
--- a/docs/test_cases/t00060_class.svg
+++ b/docs/test_cases/t00060_class.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="340px" preserveAspectRatio="none" style="width:254px;height:340px;" version="1.1" viewBox="0 0 254 340" width="254px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1p3r2hct4nbh1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fktrw86m7wxsa" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p3r2hct4nbh1)" height="48" id="C_0001373615549846303472" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="61" y="14.5"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fktrw86m7wxsa)" height="48" id="C_0001373615549846303472" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="61" y="14.5"/>
       <ellipse cx="76" cy="30.5" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M78.9688,36.1406 Q78.3906,36.4375 77.75,36.5781 Q77.1094,36.7344 76.4063,36.7344 Q73.9063,36.7344 72.5781,35.0938 Q71.2656,33.4375 71.2656,30.3125 Q71.2656,27.1875 72.5781,25.5313 Q73.9063,23.875 76.4063,23.875 Q77.1094,23.875 77.75,24.0313 Q78.4063,24.1875 78.9688,24.4844 L78.9688,27.2031 Q78.3438,26.625 77.75,26.3594 Q77.1563,26.0781 76.5313,26.0781 Q75.1875,26.0781 74.5,27.1563 Q73.8125,28.2188 73.8125,30.3125 Q73.8125,32.4063 74.5,33.4844 Q75.1875,34.5469 76.5313,34.5469 Q77.1563,34.5469 77.75,34.2813 Q78.3438,34 78.9688,33.4219 L78.9688,36.1406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="90" y="34.6543">A</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="46.5" y2="46.5"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="62" x2="100" y1="54.5" y2="54.5"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p3r2hct4nbh1)" height="48" id="C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fktrw86m7wxsa)" height="48" id="C_0000479650368930934571" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="6" y="159"/>
       <ellipse cx="21" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M23.9688,180.6406 Q23.3906,180.9375 22.75,181.0781 Q22.1094,181.2344 21.4063,181.2344 Q18.9063,181.2344 17.5781,179.5938 Q16.2656,177.9375 16.2656,174.8125 Q16.2656,171.6875 17.5781,170.0313 Q18.9063,168.375 21.4063,168.375 Q22.1094,168.375 22.75,168.5313 Q23.4063,168.6875 23.9688,168.9844 L23.9688,171.7031 Q23.3438,171.125 22.75,170.8594 Q22.1563,170.5781 21.5313,170.5781 Q20.1875,170.5781 19.5,171.6563 Q18.8125,172.7188 18.8125,174.8125 Q18.8125,176.9063 19.5,177.9844 Q20.1875,179.0469 21.5313,179.0469 Q22.1563,179.0469 22.75,178.7813 Q23.3438,178.5 23.9688,177.9219 L23.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="35" y="179.1543">B</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="7" x2="45" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p3r2hct4nbh1)" height="48" id="C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="159"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L5" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L5" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fktrw86m7wxsa)" height="48" id="C_0001827660844127264787" style="stroke: #A80036; stroke-width: 1.5;" width="40" x="81" y="159"/>
       <ellipse cx="96" cy="175" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M98.9688,180.6406 Q98.3906,180.9375 97.75,181.0781 Q97.1094,181.2344 96.4063,181.2344 Q93.9063,181.2344 92.5781,179.5938 Q91.2656,177.9375 91.2656,174.8125 Q91.2656,171.6875 92.5781,170.0313 Q93.9063,168.375 96.4063,168.375 Q97.1094,168.375 97.75,168.5313 Q98.4063,168.6875 98.9688,168.9844 L98.9688,171.7031 Q98.3438,171.125 97.75,170.8594 Q97.1563,170.5781 96.5313,170.5781 Q95.1875,170.5781 94.5,171.6563 Q93.8125,172.7188 93.8125,174.8125 Q93.8125,176.9063 94.5,177.9844 Q95.1875,179.0469 96.5313,179.0469 Q97.1563,179.0469 97.75,178.7813 Q98.3438,178.5 98.9688,177.9219 L98.9688,180.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="8" x="110" y="179.1543">C</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="191" y2="191"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="82" x2="120" y1="199" y2="199"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p3r2hct4nbh1)" height="48" id="C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="42.5" y="281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L6" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L6" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fktrw86m7wxsa)" height="48" id="C_0001629687372290281981" style="stroke: #A80036; stroke-width: 1.5;" width="41" x="42.5" y="281"/>
       <ellipse cx="57.5" cy="297" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M60.4688,302.6406 Q59.8906,302.9375 59.25,303.0781 Q58.6094,303.2344 57.9063,303.2344 Q55.4063,303.2344 54.0781,301.5938 Q52.7656,299.9375 52.7656,296.8125 Q52.7656,293.6875 54.0781,292.0313 Q55.4063,290.375 57.9063,290.375 Q58.6094,290.375 59.25,290.5313 Q59.9063,290.6875 60.4688,290.9844 L60.4688,293.7031 Q59.8438,293.125 59.25,292.8594 Q58.6563,292.5781 58.0313,292.5781 Q56.6875,292.5781 56,293.6563 Q55.3125,294.7188 55.3125,296.8125 Q55.3125,298.9063 56,299.9844 Q56.6875,301.0469 58.0313,301.0469 Q58.6563,301.0469 59.25,300.7813 Q59.8438,300.5 60.4688,299.9219 L60.4688,302.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="71.5" y="301.1543">D</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="313" y2="313"/>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="43.5" x2="82.5" y1="321" y2="321"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p3r2hct4nbh1)" height="60.8047" id="C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="136" y="8"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L10" target="_top" title="G" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L10" xlink:show="new" xlink:title="G" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fktrw86m7wxsa)" height="60.8047" id="C_0001877304825033069517" style="stroke: #A80036; stroke-width: 1.5;" width="52" x="136" y="8"/>
       <ellipse cx="151" cy="24" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M153.9688,29.6406 Q153.3906,29.9375 152.75,30.0781 Q152.1094,30.2344 151.4063,30.2344 Q148.9063,30.2344 147.5781,28.5938 Q146.2656,26.9375 146.2656,23.8125 Q146.2656,20.6875 147.5781,19.0313 Q148.9063,17.375 151.4063,17.375 Q152.1094,17.375 152.75,17.5313 Q153.4063,17.6875 153.9688,17.9844 L153.9688,20.7031 Q153.3438,20.125 152.75,19.8594 Q152.1563,19.5781 151.5313,19.5781 Q150.1875,19.5781 149.5,20.6563 Q148.8125,21.7188 148.8125,23.8125 Q148.8125,25.9063 149.5,26.9844 Q150.1875,28.0469 151.5313,28.0469 Q152.1563,28.0469 152.75,27.7813 Q153.3438,27.5 153.9688,26.9219 L153.9688,29.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="165" y="28.1543">G</text>
@@ -50,16 +50,16 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="7" x="183" y="17.1387">T</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="40" y2="40"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="142" y="46"/>
       <ellipse cx="147" cy="51" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L11" target="_top" title="g" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L11" xlink:show="new" xlink:title="g" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="26" x="156" y="54.2104">g : T</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="137" x2="187" y1="60.8047" y2="60.8047"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1p3r2hct4nbh1)" height="73.6094" id="C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="161.5" y="146"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L14" target="_top" title="H" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L14" xlink:show="new" xlink:title="H" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fktrw86m7wxsa)" height="73.6094" id="C_0001881610349123495638" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="161.5" y="146"/>
       <ellipse cx="183.7" cy="162" fill="#ADD1B2" rx="11" ry="11" style="stroke: #A80036; stroke-width: 1.0;"/>
       <path d="M186.6688,167.6406 Q186.0906,167.9375 185.45,168.0781 Q184.8094,168.2344 184.1063,168.2344 Q181.6063,168.2344 180.2781,166.5938 Q178.9656,164.9375 178.9656,161.8125 Q178.9656,158.6875 180.2781,157.0313 Q181.6063,155.375 184.1063,155.375 Q184.8094,155.375 185.45,155.5313 Q186.1063,155.6875 186.6688,155.9844 L186.6688,158.7031 Q186.0438,158.125 185.45,157.8594 Q184.8563,157.5781 184.2313,157.5781 Q182.8875,157.5781 182.2,158.6563 Q181.5125,159.7188 181.5125,161.8125 Q181.5125,163.9063 182.2,164.9844 Q182.8875,166.0469 184.2313,166.0469 Q184.8563,166.0469 185.45,165.7813 Q186.0438,165.5 186.6688,164.9219 L186.6688,167.6406 Z "/>
       <text fill="#000000" font-family="sans-serif" font-size="12" lengthAdjust="spacingAndGlyphs" textLength="9" x="199.3" y="166.1543">H</text>
@@ -67,18 +67,18 @@
       <text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="18" x="224.5" y="155.1387">T,P</text>
       <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="178" y2="178"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="184"/>
       <ellipse cx="172.5" cy="189" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L15" target="_top" title="h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L15" xlink:show="new" xlink:title="h" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="53" x="181.5" y="192.2104">h : G&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <rect fill="#FEFECE" height="10" style="stroke: none; stroke-width: 1.0;" width="20" x="167.5" y="196.8047"/>
       <ellipse cx="172.5" cy="201.8047" fill="none" rx="3" ry="3" style="stroke: #038048; stroke-width: 1.0;"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L16" target="_top" title="hh" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t00060/t00060.cc#L16" xlink:show="new" xlink:title="hh" xlink:type="simple">
       <text fill="#000000" font-family="sans-serif" font-size="11" lengthAdjust="spacingAndGlyphs" textLength="33" x="181.5" y="205.0151">hh : P</text>
     </a>
     <line style="stroke: #A80036; stroke-width: 1.5;" x1="162.5" x2="239.5" y1="211.6094" y2="211.6094"/>
diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md
index 65e31390..6ff7f716 100644
--- a/docs/test_cases/t20001.md
+++ b/docs/test_cases/t20001.md
@@ -103,3 +103,182 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20001_sequence](./t20001_sequence.svg "Basic sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20001_sequence",
+  "participants": [
+    {
+      "id": "622672604730036140",
+      "name": "clanguml::t20001::tmain()",
+      "source_location": {
+        "file": "../../tests/t20001/t20001.cc",
+        "line": 61
+      },
+      "type": "function"
+    },
+    {
+      "id": "1771943546649183134",
+      "name": "clanguml::t20001::A",
+      "source_location": {
+        "file": "../../tests/t20001/t20001.cc",
+        "line": 13
+      },
+      "type": "class"
+    },
+    {
+      "id": "272433898507800600",
+      "name": "clanguml::t20001::B",
+      "source_location": {
+        "file": "../../tests/t20001/t20001.cc",
+        "line": 36
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "622672604730036140",
+            "activity_name": "clanguml::t20001::tmain()",
+            "participant_id": "622672604730036140",
+            "participant_name": "clanguml::t20001::tmain()"
+          },
+          "name": "add(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20001/t20001.cc",
+            "line": 66
+          },
+          "to": {
+            "activity_id": "1131549932713395402",
+            "activity_name": "clanguml::t20001::A::add(int,int)",
+            "participant_id": "1771943546649183134",
+            "participant_name": "clanguml::t20001::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "622672604730036140",
+            "activity_name": "clanguml::t20001::tmain()",
+            "participant_id": "622672604730036140",
+            "participant_name": "clanguml::t20001::tmain()"
+          },
+          "name": "wrap_add3(int,int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20001/t20001.cc",
+            "line": 68
+          },
+          "to": {
+            "activity_id": "642550151323208936",
+            "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)",
+            "participant_id": "272433898507800600",
+            "participant_name": "clanguml::t20001::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "642550151323208936",
+            "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)",
+            "participant_id": "272433898507800600",
+            "participant_name": "clanguml::t20001::B"
+          },
+          "name": "add3(int,int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20001/t20001.cc",
+            "line": 52
+          },
+          "to": {
+            "activity_id": "2090436635449419593",
+            "activity_name": "clanguml::t20001::A::add3(int,int,int)",
+            "participant_id": "1771943546649183134",
+            "participant_name": "clanguml::t20001::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2090436635449419593",
+            "activity_name": "clanguml::t20001::A::add3(int,int,int)",
+            "participant_id": "1771943546649183134",
+            "participant_name": "clanguml::t20001::A"
+          },
+          "name": "add(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20001/t20001.cc",
+            "line": 25
+          },
+          "to": {
+            "activity_id": "1131549932713395402",
+            "activity_name": "clanguml::t20001::A::add(int,int)",
+            "participant_id": "1771943546649183134",
+            "participant_name": "clanguml::t20001::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2090436635449419593",
+            "activity_name": "clanguml::t20001::A::add3(int,int,int)",
+            "participant_id": "1771943546649183134",
+            "participant_name": "clanguml::t20001::A"
+          },
+          "name": "log_result(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20001/t20001.cc",
+            "line": 26
+          },
+          "to": {
+            "activity_id": "1205947631808952097",
+            "activity_name": "clanguml::t20001::A::log_result(int)",
+            "participant_id": "1771943546649183134",
+            "participant_name": "clanguml::t20001::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "642550151323208936",
+            "activity_name": "clanguml::t20001::B::wrap_add3(int,int,int)",
+            "participant_id": "272433898507800600",
+            "participant_name": "clanguml::t20001::B"
+          },
+          "name": "log_result(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20001/t20001.cc",
+            "line": 53
+          },
+          "to": {
+            "activity_id": "1205947631808952097",
+            "activity_name": "clanguml::t20001::A::log_result(int)",
+            "participant_id": "1771943546649183134",
+            "participant_name": "clanguml::t20001::A"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 622672604730036140,
+        "location": "clanguml::t20001::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20001"
+}
+```
diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg
index 9e01b57e..9ec5af81 100644
--- a/docs/test_cases/t20001_sequence.svg
+++ b/docs/test_cases/t20001_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="467px" preserveAspectRatio="none" style="width:324px;height:467px;" version="1.1" viewBox="0 0 324 467" width="324px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ud90sh8a8fss" width="300%" x="-1" y="-1">
+    <filter height="300%" id="futp225boep39" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,59 +9,59 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="77" x2="77" y1="38.2969" y2="427.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="175.5" x2="175.5" y1="38.2969" y2="427.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="303" x2="303" y1="38.2969" y2="427.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ud90sh8a8fss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L61" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L61" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#futp225boep39)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="51" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1ud90sh8a8fss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#futp225boep39)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="44" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="51" y="446.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ud90sh8a8fss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#futp225boep39)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="169.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1ud90sh8a8fss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#futp225boep39)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="162.5" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="169.5" y="446.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1ud90sh8a8fss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L36" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L36" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#futp225boep39)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="296" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1ud90sh8a8fss)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="426.2266"/>
+      <rect fill="#FEFECE" filter="url(#futp225boep39)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="289" y="426.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="296" y="446.2217">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1ud90sh8a8fss)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="321.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="72" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="155.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="178.8281"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="176" y="247.9609"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171" y="326.0938"/>
+    <rect fill="#FFFFFF" filter="url(#futp225boep39)" height="257.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="298" y="112.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159,65.4297,169,69.4297,159,73.4297,163,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="165" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="89" y="64.3638">add(int,int)</text>
     </a>
     <polygon fill="#A80036" points="93,79.4297,83,83.4297,93,87.4297,89,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="87" x2="175" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="286,108.5625,296,112.5625,286,116.5625,290,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="82" x2="292" y1="112.5625" y2="112.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="135" x="89" y="107.4966">wrap_add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="192,137.6953,182,141.6953,192,145.6953,188,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="297" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="98" x="198" y="136.6294">add3(int,int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="228" y1="165.8281" y2="165.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228" x2="228" y1="165.8281" y2="178.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="187" x2="228" y1="178.8281" y2="178.8281"/>
@@ -72,7 +72,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="228" x2="228" y1="202.8281" y2="215.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="181" x2="228" y1="215.8281" y2="215.8281"/>
     <polygon fill="#A80036" points="191,211.8281,181,215.8281,191,219.8281,187,215.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="228" y1="239.9609" y2="239.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="228" x2="228" y1="239.9609" y2="252.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="187" x2="228" y1="252.9609" y2="252.9609"/>
@@ -81,14 +81,14 @@
     </a>
     <polygon fill="#A80036" points="286,292.9609,296,296.9609,286,300.9609,290,296.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="176" x2="292" y1="296.9609" y2="296.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20001/t20001.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="192,322.0938,182,326.0938,192,330.0938,188,326.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="186" x2="297" y1="326.0938" y2="326.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="88" x="198" y="321.0278">log_result(int)</text>
     </a>
     <polygon fill="#A80036" points="88,366.0938,78,370.0938,88,374.0938,84,370.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="82" x2="302" y1="370.0938" y2="370.0938"/>
-    <path d="M8,383.0938 L8,408.0938 L143,408.0938 L143,393.0938 L133,383.0938 L8,383.0938 " fill="#FBFB77" filter="url(#f1ud90sh8a8fss)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M8,383.0938 L8,408.0938 L143,408.0938 L143,393.0938 L133,383.0938 L8,383.0938 " fill="#FBFB77" filter="url(#futp225boep39)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M133,383.0938 L133,393.0938 L143,393.0938 L133,383.0938 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="114" x="14" y="400.1606">Main test function</text>
   </g>
diff --git a/docs/test_cases/t20002.md b/docs/test_cases/t20002.md
index 65f8c51e..dd0e9567 100644
--- a/docs/test_cases/t20002.md
+++ b/docs/test_cases/t20002.md
@@ -40,3 +40,125 @@ void m1() { m2(); }
 ```
 ## Generated UML diagrams
 ![t20002_sequence](./t20002_sequence.svg "Free function sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20002_sequence",
+  "participants": [
+    {
+      "id": "1619421429271064154",
+      "name": "clanguml::t20002::m1()",
+      "source_location": {
+        "file": "../../tests/t20002/t20002.cc",
+        "line": 14
+      },
+      "type": "function"
+    },
+    {
+      "id": "1575240232156112674",
+      "name": "clanguml::t20002::m2()",
+      "source_location": {
+        "file": "../../tests/t20002/t20002.cc",
+        "line": 12
+      },
+      "type": "function"
+    },
+    {
+      "id": "1838809176089209580",
+      "name": "clanguml::t20002::m3()",
+      "source_location": {
+        "file": "../../tests/t20002/t20002.cc",
+        "line": 10
+      },
+      "type": "function"
+    },
+    {
+      "id": "63715062711218534",
+      "name": "clanguml::t20002::m4()",
+      "source_location": {
+        "file": "../../tests/t20002/t20002.cc",
+        "line": 8
+      },
+      "type": "function"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1619421429271064154",
+            "activity_name": "clanguml::t20002::m1()",
+            "participant_id": "1619421429271064154",
+            "participant_name": "clanguml::t20002::m1()"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20002/t20002.cc",
+            "line": 14
+          },
+          "to": {
+            "activity_id": "1575240232156112674",
+            "activity_name": "clanguml::t20002::m2()",
+            "participant_id": "1575240232156112674",
+            "participant_name": "clanguml::t20002::m2()"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1575240232156112674",
+            "activity_name": "clanguml::t20002::m2()",
+            "participant_id": "1575240232156112674",
+            "participant_name": "clanguml::t20002::m2()"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20002/t20002.cc",
+            "line": 12
+          },
+          "to": {
+            "activity_id": "1838809176089209580",
+            "activity_name": "clanguml::t20002::m3()",
+            "participant_id": "1838809176089209580",
+            "participant_name": "clanguml::t20002::m3()"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1838809176089209580",
+            "activity_name": "clanguml::t20002::m3()",
+            "participant_id": "1838809176089209580",
+            "participant_name": "clanguml::t20002::m3()"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20002/t20002.cc",
+            "line": 10
+          },
+          "to": {
+            "activity_id": "63715062711218534",
+            "activity_name": "clanguml::t20002::m4()",
+            "participant_id": "63715062711218534",
+            "participant_name": "clanguml::t20002::m4()"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1619421429271064154,
+        "location": "clanguml::t20002::m1()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20002"
+}
+```
diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg
index 5fa454fb..f77ca2a9 100644
--- a/docs/test_cases/t20002_sequence.svg
+++ b/docs/test_cases/t20002_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:245px;height:170px;" version="1.1" viewBox="0 0 245 170" width="245px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1hyt7vpbjofdd" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzi5cua4ap3dc" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1hyt7vpbjofdd)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hyt7vpbjofdd)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hyt7vpbjofdd)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hyt7vpbjofdd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzi5cua4ap3dc)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzi5cua4ap3dc)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzi5cua4ap3dc)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzi5cua4ap3dc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="33" x2="33" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="93" x2="93" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="153" x2="153" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="213" x2="213" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hyt7vpbjofdd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L14" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzi5cua4ap3dc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="22.9951">m1()</text>
-      <rect fill="#FEFECE" filter="url(#f1hyt7vpbjofdd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fzi5cua4ap3dc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="15" y="149.292">m1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hyt7vpbjofdd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L12" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzi5cua4ap3dc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="22.9951">m2()</text>
-      <rect fill="#FEFECE" filter="url(#f1hyt7vpbjofdd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fzi5cua4ap3dc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="68" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="75" y="149.292">m2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hyt7vpbjofdd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L10" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzi5cua4ap3dc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="22.9951">m3()</text>
-      <rect fill="#FEFECE" filter="url(#f1hyt7vpbjofdd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fzi5cua4ap3dc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="128" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="135" y="149.292">m3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1hyt7vpbjofdd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzi5cua4ap3dc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="22.9951">m4()</text>
-      <rect fill="#FEFECE" filter="url(#f1hyt7vpbjofdd)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#fzi5cua4ap3dc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="46" x="188" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="32" x="195" y="149.292">m4()</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1hyt7vpbjofdd)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hyt7vpbjofdd)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hyt7vpbjofdd)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1hyt7vpbjofdd)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fzi5cua4ap3dc)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="28" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzi5cua4ap3dc)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="88" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzi5cua4ap3dc)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="148" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzi5cua4ap3dc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="208" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L14" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L14" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="76,50.2969,86,54.2969,76,58.2969,80,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="38" x2="82" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="136,64.2969,146,68.2969,136,72.2969,140,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="98" x2="142" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20002/t20002.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="196,78.2969,206,82.2969,196,86.2969,200,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="158" x2="202" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20003.md b/docs/test_cases/t20003.md
index f38f01e6..d4b5241e 100644
--- a/docs/test_cases/t20003.md
+++ b/docs/test_cases/t20003.md
@@ -36,3 +36,125 @@ template <typename T> void m1(T p) { m2<T>(p); }
 ```
 ## Generated UML diagrams
 ![t20003_sequence](./t20003_sequence.svg "Function template sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20003_sequence",
+  "participants": [
+    {
+      "id": "469205740799240869",
+      "name": "clanguml::t20003::m1<T>(T)",
+      "source_location": {
+        "file": "../../tests/t20003/t20003.cc",
+        "line": 10
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "1502957449367040488",
+      "name": "clanguml::t20003::m2<T>(T)",
+      "source_location": {
+        "file": "../../tests/t20003/t20003.cc",
+        "line": 8
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "613477682313507585",
+      "name": "clanguml::t20003::m3<T>(T)",
+      "source_location": {
+        "file": "../../tests/t20003/t20003.cc",
+        "line": 6
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "619960023608507925",
+      "name": "clanguml::t20003::m4<T>(T)",
+      "source_location": {
+        "file": "../../tests/t20003/t20003.cc",
+        "line": 4
+      },
+      "type": "function_template"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "469205740799240869",
+            "activity_name": "clanguml::t20003::m1<T>(T)",
+            "participant_id": "469205740799240869",
+            "participant_name": "clanguml::t20003::m1<T>(T)"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20003/t20003.cc",
+            "line": 10
+          },
+          "to": {
+            "activity_id": "1502957449367040488",
+            "activity_name": "clanguml::t20003::m2<T>(T)",
+            "participant_id": "1502957449367040488",
+            "participant_name": "clanguml::t20003::m2<T>(T)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1502957449367040488",
+            "activity_name": "clanguml::t20003::m2<T>(T)",
+            "participant_id": "1502957449367040488",
+            "participant_name": "clanguml::t20003::m2<T>(T)"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20003/t20003.cc",
+            "line": 8
+          },
+          "to": {
+            "activity_id": "613477682313507585",
+            "activity_name": "clanguml::t20003::m3<T>(T)",
+            "participant_id": "613477682313507585",
+            "participant_name": "clanguml::t20003::m3<T>(T)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "613477682313507585",
+            "activity_name": "clanguml::t20003::m3<T>(T)",
+            "participant_id": "613477682313507585",
+            "participant_name": "clanguml::t20003::m3<T>(T)"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20003/t20003.cc",
+            "line": 6
+          },
+          "to": {
+            "activity_id": "619960023608507925",
+            "activity_name": "clanguml::t20003::m4<T>(T)",
+            "participant_id": "619960023608507925",
+            "participant_name": "clanguml::t20003::m4<T>(T)"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 469205740799240869,
+        "location": "clanguml::t20003::m1<T>(T)"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20003"
+}
+```
diff --git a/docs/test_cases/t20003_sequence.svg b/docs/test_cases/t20003_sequence.svg
index a24732b3..a000e488 100644
--- a/docs/test_cases/t20003_sequence.svg
+++ b/docs/test_cases/t20003_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="170px" preserveAspectRatio="none" style="width:413px;height:170px;" version="1.1" viewBox="0 0 413 170" width="413px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fm9m80zxslr2u" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f5m6wu64cudbf" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,51 +9,51 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fm9m80zxslr2u)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fm9m80zxslr2u)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fm9m80zxslr2u)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fm9m80zxslr2u)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5m6wu64cudbf)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5m6wu64cudbf)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5m6wu64cudbf)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5m6wu64cudbf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="54" x2="54" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="156" x2="156" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="258" x2="258" y1="38.2969" y2="130.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="360" x2="360" y1="38.2969" y2="130.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm9m80zxslr2u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L10" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5m6wu64cudbf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="22.9951">m1&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#fm9m80zxslr2u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f5m6wu64cudbf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="8" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="15" y="149.292">m1&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm9m80zxslr2u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L8" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5m6wu64cudbf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="22.9951">m2&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#fm9m80zxslr2u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f5m6wu64cudbf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="110" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="117" y="149.292">m2&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm9m80zxslr2u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L6" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5m6wu64cudbf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="22.9951">m3&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#fm9m80zxslr2u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f5m6wu64cudbf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="212" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="219" y="149.292">m3&lt;T&gt;(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fm9m80zxslr2u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L4" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L4" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f5m6wu64cudbf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="22.9951">m4&lt;T&gt;(T)</text>
-      <rect fill="#FEFECE" filter="url(#fm9m80zxslr2u)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
+      <rect fill="#FEFECE" filter="url(#f5m6wu64cudbf)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="314" y="129.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="321" y="149.292">m4&lt;T&gt;(T)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fm9m80zxslr2u)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fm9m80zxslr2u)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fm9m80zxslr2u)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fm9m80zxslr2u)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f5m6wu64cudbf)" height="64" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="49" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5m6wu64cudbf)" height="58" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="151" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5m6wu64cudbf)" height="44" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="253" y="68.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f5m6wu64cudbf)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="355" y="82.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="139,50.2969,149,54.2969,139,58.2969,143,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="59" x2="145" y1="54.2969" y2="54.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="241,64.2969,251,68.2969,241,72.2969,245,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="247" y1="68.2969" y2="68.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20003/t20003.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="343,78.2969,353,82.2969,343,86.2969,347,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="263" x2="349" y1="82.2969" y2="82.2969"/>
     </a>
diff --git a/docs/test_cases/t20004.md b/docs/test_cases/t20004.md
index 6d9fdd8d..7e61a578 100644
--- a/docs/test_cases/t20004.md
+++ b/docs/test_cases/t20004.md
@@ -72,3 +72,311 @@ int main()
 ```
 ## Generated UML diagrams
 ![t20004_sequence](./t20004_sequence.svg "Function template instantiation sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20004_sequence",
+  "participants": [
+    {
+      "id": "2299662004367884401",
+      "name": "clanguml::t20004::main()",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 38
+      },
+      "type": "function"
+    },
+    {
+      "id": "138925040763435897",
+      "name": "clanguml::t20004::m1<float>(float)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 26
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "1239083518717603720",
+      "name": "clanguml::t20004::m1<unsigned long>(unsigned long)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 28
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "376599675205498367",
+      "name": "clanguml::t20004::m4<unsigned long>(unsigned long)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 10
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "1845817984839618223",
+      "name": "clanguml::t20004::m1<std::string>(std::string)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 33
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "1735054254122948614",
+      "name": "clanguml::t20004::m2<std::string>(std::string)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 19
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "121663532044911922",
+      "name": "clanguml::t20004::m1<int>(int)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 24
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "1475362124497386656",
+      "name": "clanguml::t20004::m2<int>(int)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 17
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "734999226157549914",
+      "name": "clanguml::t20004::m3<int>(int)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 15
+      },
+      "type": "function_template"
+    },
+    {
+      "id": "1006390865908497562",
+      "name": "clanguml::t20004::m4<int>(int)",
+      "source_location": {
+        "file": "../../tests/t20004/t20004.cc",
+        "line": 8
+      },
+      "type": "function_template"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "2299662004367884401",
+            "activity_name": "clanguml::t20004::main()",
+            "participant_id": "2299662004367884401",
+            "participant_name": "clanguml::t20004::main()"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 40
+          },
+          "to": {
+            "activity_id": "138925040763435897",
+            "activity_name": "clanguml::t20004::m1<float>(float)",
+            "participant_id": "138925040763435897",
+            "participant_name": "clanguml::t20004::m1<float>(float)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2299662004367884401",
+            "activity_name": "clanguml::t20004::main()",
+            "participant_id": "2299662004367884401",
+            "participant_name": "clanguml::t20004::main()"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 42
+          },
+          "to": {
+            "activity_id": "1239083518717603720",
+            "activity_name": "clanguml::t20004::m1<unsigned long>(unsigned long)",
+            "participant_id": "1239083518717603720",
+            "participant_name": "clanguml::t20004::m1<unsigned long>(unsigned long)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1239083518717603720",
+            "activity_name": "clanguml::t20004::m1<unsigned long>(unsigned long)",
+            "participant_id": "1239083518717603720",
+            "participant_name": "clanguml::t20004::m1<unsigned long>(unsigned long)"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 30
+          },
+          "to": {
+            "activity_id": "376599675205498367",
+            "activity_name": "clanguml::t20004::m4<unsigned long>(unsigned long)",
+            "participant_id": "376599675205498367",
+            "participant_name": "clanguml::t20004::m4<unsigned long>(unsigned long)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2299662004367884401",
+            "activity_name": "clanguml::t20004::main()",
+            "participant_id": "2299662004367884401",
+            "participant_name": "clanguml::t20004::main()"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 44
+          },
+          "to": {
+            "activity_id": "1845817984839618223",
+            "activity_name": "clanguml::t20004::m1<std::string>(std::string)",
+            "participant_id": "1845817984839618223",
+            "participant_name": "clanguml::t20004::m1<std::string>(std::string)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1845817984839618223",
+            "activity_name": "clanguml::t20004::m1<std::string>(std::string)",
+            "participant_id": "1845817984839618223",
+            "participant_name": "clanguml::t20004::m1<std::string>(std::string)"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 35
+          },
+          "to": {
+            "activity_id": "1735054254122948614",
+            "activity_name": "clanguml::t20004::m2<std::string>(std::string)",
+            "participant_id": "1735054254122948614",
+            "participant_name": "clanguml::t20004::m2<std::string>(std::string)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2299662004367884401",
+            "activity_name": "clanguml::t20004::main()",
+            "participant_id": "2299662004367884401",
+            "participant_name": "clanguml::t20004::main()"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 46
+          },
+          "to": {
+            "activity_id": "121663532044911922",
+            "activity_name": "clanguml::t20004::m1<int>(int)",
+            "participant_id": "121663532044911922",
+            "participant_name": "clanguml::t20004::m1<int>(int)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "121663532044911922",
+            "activity_name": "clanguml::t20004::m1<int>(int)",
+            "participant_id": "121663532044911922",
+            "participant_name": "clanguml::t20004::m1<int>(int)"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 24
+          },
+          "to": {
+            "activity_id": "1475362124497386656",
+            "activity_name": "clanguml::t20004::m2<int>(int)",
+            "participant_id": "1475362124497386656",
+            "participant_name": "clanguml::t20004::m2<int>(int)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1475362124497386656",
+            "activity_name": "clanguml::t20004::m2<int>(int)",
+            "participant_id": "1475362124497386656",
+            "participant_name": "clanguml::t20004::m2<int>(int)"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 17
+          },
+          "to": {
+            "activity_id": "734999226157549914",
+            "activity_name": "clanguml::t20004::m3<int>(int)",
+            "participant_id": "734999226157549914",
+            "participant_name": "clanguml::t20004::m3<int>(int)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "734999226157549914",
+            "activity_name": "clanguml::t20004::m3<int>(int)",
+            "participant_id": "734999226157549914",
+            "participant_name": "clanguml::t20004::m3<int>(int)"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20004/t20004.cc",
+            "line": 15
+          },
+          "to": {
+            "activity_id": "1006390865908497562",
+            "activity_name": "clanguml::t20004::m4<int>(int)",
+            "participant_id": "1006390865908497562",
+            "participant_name": "clanguml::t20004::m4<int>(int)"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 2299662004367884401,
+        "location": "clanguml::t20004::main()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20004"
+}
+```
diff --git a/docs/test_cases/t20004_sequence.svg b/docs/test_cases/t20004_sequence.svg
index fd57b6f7..9449b5f1 100644
--- a/docs/test_cases/t20004_sequence.svg
+++ b/docs/test_cases/t20004_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="350px" preserveAspectRatio="none" style="width:1706px;height:350px;" version="1.1" viewBox="0 0 1706 350" width="1706px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fipdfaj5q5u70" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fedpd91t8ua4l" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,16 +9,16 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="38" x2="38" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="145" x2="145" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="357" x2="357" y1="38.2969" y2="310.2969"/>
@@ -29,87 +29,87 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1409" x2="1409" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1527" x2="1527" y1="38.2969" y2="310.2969"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1645" x2="1645" y1="38.2969" y2="310.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L38" target="_top" title="main" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L38" xlink:show="new" xlink:title="main" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="22.9951">main()</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="8" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="15" y="329.292">main()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L26" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L26" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="22.9951">m1&lt;float&gt;(float)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="128" x="79" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="114" x="86" y="329.292">m1&lt;float&gt;(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L28" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L28" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="22.9951">m1&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="221" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="228" y="329.292">m1&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L10" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L10" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="22.9951">m4&lt;unsigned long&gt;(unsigned long)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="268" x="503" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="254" x="510" y="329.292">m4&lt;unsigned long&gt;(unsigned long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L33" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L33" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="22.9951">m1&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="785" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="792" y="329.292">m1&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L19" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L19" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="22.9951">m2&lt;std::string&gt;(std::string)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="212" x="1011" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="198" x="1018" y="329.292">m2&lt;std::string&gt;(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L24" target="_top" title="m1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="m1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="22.9951">m1&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1237" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1244" y="329.292">m1&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L17" target="_top" title="m2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="m2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="22.9951">m2&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1355" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1362" y="329.292">m2&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L15" target="_top" title="m3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="m3" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="22.9951">m3&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1473" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1480" y="329.292">m3&lt;int&gt;(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L8" target="_top" title="m4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L8" xlink:show="new" xlink:title="m4" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="22.9951">m4&lt;int&gt;(int)</text>
-      <rect fill="#FEFECE" filter="url(#fipdfaj5q5u70)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
+      <rect fill="#FEFECE" filter="url(#fedpd91t8ua4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="1591" y="309.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="1598" y="329.292">m4&lt;int&gt;(int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fipdfaj5q5u70)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="244" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="33.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="140" y="54.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="352" y="82.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="634" y="96.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="888" y="138.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1114" y="152.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="98" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1286" y="194.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="70" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1404" y="208.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="42" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1522" y="222.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fedpd91t8ua4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1640" y="236.2969"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="128,50.2969,138,54.2969,128,58.2969,132,54.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="134" y1="54.2969" y2="54.2969"/>
     </a>
     <polygon fill="#A80036" points="54.5,64.2969,44.5,68.2969,54.5,72.2969,50.5,68.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="144" y1="68.2969" y2="68.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="340,78.2969,350,82.2969,340,86.2969,344,82.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="346" y1="82.2969" y2="82.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="622,92.2969,632,96.2969,622,100.2969,626,96.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="362" x2="628" y1="96.2969" y2="96.2969"/>
     </a>
@@ -117,11 +117,11 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="367" x2="638" y1="110.2969" y2="110.2969"/>
     <polygon fill="#A80036" points="54.5,120.2969,44.5,124.2969,54.5,128.2969,50.5,124.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="356" y1="124.2969" y2="124.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L44" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L44" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="876,134.2969,886,138.2969,876,142.2969,880,138.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="882" y1="138.2969" y2="138.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1102,148.2969,1112,152.2969,1102,156.2969,1106,152.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="898" x2="1108" y1="152.2969" y2="152.2969"/>
     </a>
@@ -129,19 +129,19 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="903" x2="1118" y1="166.2969" y2="166.2969"/>
     <polygon fill="#A80036" points="54.5,176.2969,44.5,180.2969,54.5,184.2969,50.5,180.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="48.5" x2="892" y1="180.2969" y2="180.2969"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1274,190.2969,1284,194.2969,1274,198.2969,1278,194.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="43.5" x2="1280" y1="194.2969" y2="194.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1392,204.2969,1402,208.2969,1392,212.2969,1396,208.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1296" x2="1398" y1="208.2969" y2="208.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1510,218.2969,1520,222.2969,1510,226.2969,1514,222.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1414" x2="1516" y1="222.2969" y2="222.2969"/>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20004/t20004.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1628,232.2969,1638,236.2969,1628,240.2969,1632,236.2969" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1532" x2="1634" y1="236.2969" y2="236.2969"/>
     </a>
diff --git a/docs/test_cases/t20005.md b/docs/test_cases/t20005.md
index d3d4e8c9..dea3b4ad 100644
--- a/docs/test_cases/t20005.md
+++ b/docs/test_cases/t20005.md
@@ -43,3 +43,94 @@ template <typename T> struct C {
 ```
 ## Generated UML diagrams
 ![t20005_sequence](./t20005_sequence.svg "Class template basic sequence diagram")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20005_sequence",
+  "participants": [
+    {
+      "id": "365569130532127604",
+      "name": "clanguml::t20005::C<T>",
+      "source_location": {
+        "file": "../../tests/t20005/t20005.cc",
+        "line": 14
+      },
+      "type": "class"
+    },
+    {
+      "id": "666000829532846850",
+      "name": "clanguml::t20005::B<T>",
+      "source_location": {
+        "file": "../../tests/t20005/t20005.cc",
+        "line": 8
+      },
+      "type": "class"
+    },
+    {
+      "id": "1278330455625941185",
+      "name": "clanguml::t20005::A<T>",
+      "source_location": {
+        "file": "../../tests/t20005/t20005.cc",
+        "line": 4
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "578718872965404973",
+            "activity_name": "clanguml::t20005::C<T>::c(T)",
+            "participant_id": "365569130532127604",
+            "participant_name": "clanguml::t20005::C<T>"
+          },
+          "name": "b(T)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20005/t20005.cc",
+            "line": 15
+          },
+          "to": {
+            "activity_id": "870466496899932117",
+            "activity_name": "clanguml::t20005::B<T>::b(T)",
+            "participant_id": "666000829532846850",
+            "participant_name": "clanguml::t20005::B<T>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "870466496899932117",
+            "activity_name": "clanguml::t20005::B<T>::b(T)",
+            "participant_id": "666000829532846850",
+            "participant_name": "clanguml::t20005::B<T>"
+          },
+          "name": "a(T)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20005/t20005.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "124853455814403745",
+            "activity_name": "clanguml::t20005::A<T>::a(T)",
+            "participant_id": "1278330455625941185",
+            "participant_name": "clanguml::t20005::A<T>"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 578718872965404973,
+        "location": "clanguml::t20005::C<T>::c(T)"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20005"
+}
+```
diff --git a/docs/test_cases/t20005_sequence.svg b/docs/test_cases/t20005_sequence.svg
index e6ecf1ba..9bc92713 100644
--- a/docs/test_cases/t20005_sequence.svg
+++ b/docs/test_cases/t20005_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:229px;height:227px;" version="1.1" viewBox="0 0 229 227" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fyuqrz9g526mb" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fljbwc7955lri" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fyuqrz9g526mb)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fyuqrz9g526mb)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fyuqrz9g526mb)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fljbwc7955lri)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fljbwc7955lri)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fljbwc7955lri)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="50.5" x2="50.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="121.5" x2="121.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="192.5" x2="192.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyuqrz9g526mb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L14" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L14" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fljbwc7955lri)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="22.9951">C&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fyuqrz9g526mb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#fljbwc7955lri)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="20.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="27.5" y="206.6904">C&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyuqrz9g526mb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fljbwc7955lri)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="22.9951">B&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fyuqrz9g526mb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#fljbwc7955lri)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="57" x="91.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="98.5" y="206.6904">B&lt;T&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyuqrz9g526mb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fljbwc7955lri)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="22.9951">A&lt;T&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fyuqrz9g526mb)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#fljbwc7955lri)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="56" x="162.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="42" x="169.5" y="206.6904">A&lt;T&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fyuqrz9g526mb)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fyuqrz9g526mb)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fyuqrz9g526mb)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fljbwc7955lri)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="46" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fljbwc7955lri)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="117" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fljbwc7955lri)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187.5" y="127.6953"/>
     <polygon fill="#A80036" points="34,65.4297,44,69.4297,34,73.4297,38,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="40" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="10" y="64.3638">c(T)</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="105,94.5625,115,98.5625,105,102.5625,109,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="56" x2="111" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="63" y="93.4966">b(T)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20005/t20005.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175.5,123.6953,185.5,127.6953,175.5,131.6953,179.5,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="127" x2="181.5" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="134" y="122.6294">a(T)</text>
diff --git a/docs/test_cases/t20006.md b/docs/test_cases/t20006.md
index 6f766f95..46365896 100644
--- a/docs/test_cases/t20006.md
+++ b/docs/test_cases/t20006.md
@@ -101,3 +101,434 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20006_sequence](./t20006_sequence.svg "Class template specialization basic sequence diagram")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20006_sequence",
+  "participants": [
+    {
+      "id": "363965584448680958",
+      "name": "clanguml::t20006::tmain()",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 57
+      },
+      "type": "function"
+    },
+    {
+      "id": "2197760498261923035",
+      "name": "clanguml::t20006::B<int>",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 11
+      },
+      "type": "class"
+    },
+    {
+      "id": "596484796124829039",
+      "name": "clanguml::t20006::A<int>",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "2102622661983365981",
+      "name": "clanguml::t20006::B<std::string>",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 16
+      },
+      "type": "class"
+    },
+    {
+      "id": "413459875415381273",
+      "name": "clanguml::t20006::A<std::string>",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "264392653889863384",
+      "name": "clanguml::t20006::BB<int,int>",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 26
+      },
+      "type": "class"
+    },
+    {
+      "id": "1903567228894636312",
+      "name": "clanguml::t20006::AA<int>",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 21
+      },
+      "type": "class"
+    },
+    {
+      "id": "2269742833301555472",
+      "name": "clanguml::t20006::BB<int,std::string>",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 33
+      },
+      "type": "class"
+    },
+    {
+      "id": "1743503037360505162",
+      "name": "clanguml::t20006::BB<int,float>",
+      "source_location": {
+        "file": "../../tests/t20006/t20006.cc",
+        "line": 45
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "363965584448680958",
+            "activity_name": "clanguml::t20006::tmain()",
+            "participant_id": "363965584448680958",
+            "participant_name": "clanguml::t20006::tmain()"
+          },
+          "name": "b(int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 62
+          },
+          "to": {
+            "activity_id": "250247217888843587",
+            "activity_name": "clanguml::t20006::B<int>::b(int)",
+            "participant_id": "2197760498261923035",
+            "participant_name": "clanguml::t20006::B<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "250247217888843587",
+            "activity_name": "clanguml::t20006::B<int>::b(int)",
+            "participant_id": "2197760498261923035",
+            "participant_name": "clanguml::t20006::B<int>"
+          },
+          "name": "a1(int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 12
+          },
+          "to": {
+            "activity_id": "196390487987395669",
+            "activity_name": "clanguml::t20006::A<int>::a1(int)",
+            "participant_id": "596484796124829039",
+            "participant_name": "clanguml::t20006::A<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "363965584448680958",
+            "activity_name": "clanguml::t20006::tmain()",
+            "participant_id": "363965584448680958",
+            "participant_name": "clanguml::t20006::tmain()"
+          },
+          "name": "b(std::string)",
+          "return_type": "std::string",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 63
+          },
+          "to": {
+            "activity_id": "13049632552871157",
+            "activity_name": "clanguml::t20006::B<std::string>::b(std::string)",
+            "participant_id": "2102622661983365981",
+            "participant_name": "clanguml::t20006::B<std::string>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "13049632552871157",
+            "activity_name": "clanguml::t20006::B<std::string>::b(std::string)",
+            "participant_id": "2102622661983365981",
+            "participant_name": "clanguml::t20006::B<std::string>"
+          },
+          "name": "a2(std::string)",
+          "return_type": "class std::basic_string<char>",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 17
+          },
+          "to": {
+            "activity_id": "11762588624112907",
+            "activity_name": "clanguml::t20006::A<std::string>::a2(std::string)",
+            "participant_id": "413459875415381273",
+            "participant_name": "clanguml::t20006::A<std::string>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "363965584448680958",
+            "activity_name": "clanguml::t20006::tmain()",
+            "participant_id": "363965584448680958",
+            "participant_name": "clanguml::t20006::tmain()"
+          },
+          "name": "bb1(int,int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 70
+          },
+          "to": {
+            "activity_id": "1213865121829347654",
+            "activity_name": "clanguml::t20006::BB<int,int>::bb1(int,int)",
+            "participant_id": "264392653889863384",
+            "participant_name": "clanguml::t20006::BB<int,int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1213865121829347654",
+            "activity_name": "clanguml::t20006::BB<int,int>::bb1(int,int)",
+            "participant_id": "264392653889863384",
+            "participant_name": "clanguml::t20006::BB<int,int>"
+          },
+          "name": "aa1(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 27
+          },
+          "to": {
+            "activity_id": "1235428163990670191",
+            "activity_name": "clanguml::t20006::AA<int>::aa1(int)",
+            "participant_id": "1903567228894636312",
+            "participant_name": "clanguml::t20006::AA<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "363965584448680958",
+            "activity_name": "clanguml::t20006::tmain()",
+            "participant_id": "363965584448680958",
+            "participant_name": "clanguml::t20006::tmain()"
+          },
+          "name": "bb2(int,int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 71
+          },
+          "to": {
+            "activity_id": "361650123916792854",
+            "activity_name": "clanguml::t20006::BB<int,int>::bb2(int,int)",
+            "participant_id": "264392653889863384",
+            "participant_name": "clanguml::t20006::BB<int,int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "361650123916792854",
+            "activity_name": "clanguml::t20006::BB<int,int>::bb2(int,int)",
+            "participant_id": "264392653889863384",
+            "participant_name": "clanguml::t20006::BB<int,int>"
+          },
+          "name": "aa2(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 28
+          },
+          "to": {
+            "activity_id": "582097827335267290",
+            "activity_name": "clanguml::t20006::AA<int>::aa2(int)",
+            "participant_id": "1903567228894636312",
+            "participant_name": "clanguml::t20006::AA<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "363965584448680958",
+            "activity_name": "clanguml::t20006::tmain()",
+            "participant_id": "363965584448680958",
+            "participant_name": "clanguml::t20006::tmain()"
+          },
+          "name": "bb1(int,std::string)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 73
+          },
+          "to": {
+            "activity_id": "1062874005712014125",
+            "activity_name": "clanguml::t20006::BB<int,std::string>::bb1(int,std::string)",
+            "participant_id": "2269742833301555472",
+            "participant_name": "clanguml::t20006::BB<int,std::string>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1062874005712014125",
+            "activity_name": "clanguml::t20006::BB<int,std::string>::bb1(int,std::string)",
+            "participant_id": "2269742833301555472",
+            "participant_name": "clanguml::t20006::BB<int,std::string>"
+          },
+          "name": "aa2(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 34
+          },
+          "to": {
+            "activity_id": "582097827335267290",
+            "activity_name": "clanguml::t20006::AA<int>::aa2(int)",
+            "participant_id": "1903567228894636312",
+            "participant_name": "clanguml::t20006::AA<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "363965584448680958",
+            "activity_name": "clanguml::t20006::tmain()",
+            "participant_id": "363965584448680958",
+            "participant_name": "clanguml::t20006::tmain()"
+          },
+          "name": "bb2(int,std::string)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 74
+          },
+          "to": {
+            "activity_id": "787705189994778234",
+            "activity_name": "clanguml::t20006::BB<int,std::string>::bb2(int,std::string)",
+            "participant_id": "2269742833301555472",
+            "participant_name": "clanguml::t20006::BB<int,std::string>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "787705189994778234",
+            "activity_name": "clanguml::t20006::BB<int,std::string>::bb2(int,std::string)",
+            "participant_id": "2269742833301555472",
+            "participant_name": "clanguml::t20006::BB<int,std::string>"
+          },
+          "name": "aa1(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 35
+          },
+          "to": {
+            "activity_id": "1235428163990670191",
+            "activity_name": "clanguml::t20006::AA<int>::aa1(int)",
+            "participant_id": "1903567228894636312",
+            "participant_name": "clanguml::t20006::AA<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "363965584448680958",
+            "activity_name": "clanguml::t20006::tmain()",
+            "participant_id": "363965584448680958",
+            "participant_name": "clanguml::t20006::tmain()"
+          },
+          "name": "bb1(int,float)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 76
+          },
+          "to": {
+            "activity_id": "1463188845572485713",
+            "activity_name": "clanguml::t20006::BB<int,float>::bb1(int,float)",
+            "participant_id": "1743503037360505162",
+            "participant_name": "clanguml::t20006::BB<int,float>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1463188845572485713",
+            "activity_name": "clanguml::t20006::BB<int,float>::bb1(int,float)",
+            "participant_id": "1743503037360505162",
+            "participant_name": "clanguml::t20006::BB<int,float>"
+          },
+          "name": "bb2(int,float)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 46
+          },
+          "to": {
+            "activity_id": "732362671329401903",
+            "activity_name": "clanguml::t20006::BB<int,float>::bb2(int,float)",
+            "participant_id": "1743503037360505162",
+            "participant_name": "clanguml::t20006::BB<int,float>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "732362671329401903",
+            "activity_name": "clanguml::t20006::BB<int,float>::bb2(int,float)",
+            "participant_id": "1743503037360505162",
+            "participant_name": "clanguml::t20006::BB<int,float>"
+          },
+          "name": "aa2(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20006/t20006.cc",
+            "line": 47
+          },
+          "to": {
+            "activity_id": "582097827335267290",
+            "activity_name": "clanguml::t20006::AA<int>::aa2(int)",
+            "participant_id": "1903567228894636312",
+            "participant_name": "clanguml::t20006::AA<int>"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 363965584448680958,
+        "location": "clanguml::t20006::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20006"
+}
+```
diff --git a/docs/test_cases/t20006_sequence.svg b/docs/test_cases/t20006_sequence.svg
index 01f4bdf4..c9b07bdc 100644
--- a/docs/test_cases/t20006_sequence.svg
+++ b/docs/test_cases/t20006_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:1034px;height:754px;" version="1.1" viewBox="0 0 1034 754" width="1034px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="frnmv0o6osk0z" width="300%" x="-1" y="-1">
+    <filter height="300%" id="figt1eyok59wn" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="714.2891"/>
@@ -34,82 +34,82 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="654" x2="654" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="780" x2="780" y1="38.2969" y2="714.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="923" x2="923" y1="38.2969" y2="714.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L57" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L57" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="733.2842">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="733.2842">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="733.2842">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="241" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="248" y="733.2842">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="374" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="381" y="733.2842">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L26" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L26" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="513" y="22.9951">BB&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="96" x="506" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="82" x="513" y="733.2842">BB&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L21" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L21" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="623" y="22.9951">AA&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="73" x="616" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="59" x="623" y="733.2842">AA&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L33" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L33" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="710" y="22.9951">BB&lt;int,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="150" x="703" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="136" x="710" y="733.2842">BB&lt;int,std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L45" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L45" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="874" y="22.9951">BB&lt;int,float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#frnmv0o6osk0z)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="713.2891"/>
+      <rect fill="#FEFECE" filter="url(#figt1eyok59wn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="108" x="867" y="713.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="94" x="874" y="733.2842">BB&lt;int,float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
-    <rect fill="#FFFFFF" filter="url(#frnmv0o6osk0z)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="647.9922" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="297.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="430" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="551" y="330.2266"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="359.3594"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="447.625"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="649.5" y="666.2891"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="418.4922"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="775" y="506.7578"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="101.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="918" y="595.0234"/>
+    <rect fill="#FFFFFF" filter="url(#figt1eyok59wn)" height="64.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="923" y="632.1563"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
@@ -118,12 +118,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="128.5" x2="196" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="117.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="285.5,151.6953,295.5,155.6953,285.5,159.6953,289.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="291.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="150.6294">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="418,180.8281,428,184.8281,418,188.8281,422,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="307.5" x2="424" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="314.5" y="179.7622">a2(std::string)</text>
@@ -132,59 +132,59 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="312.5" x2="434" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="301.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L70" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L70" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="539,237.9609,549,241.9609,539,245.9609,543,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="545" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="236.895">bb1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L27" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L27" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="637.5,267.0938,647.5,271.0938,637.5,275.0938,641.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="561" x2="643.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="568" y="266.0278">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L71" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L71" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="539,326.2266,549,330.2266,539,334.2266,543,330.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="545" y1="330.2266" y2="330.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="70" x="53" y="325.1606">bb2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="637.5,355.3594,647.5,359.3594,637.5,363.3594,641.5,359.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="561" x2="643.5" y1="359.3594" y2="359.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="568" y="354.2935">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L73" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L73" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="763,414.4922,773,418.4922,763,422.4922,767,418.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="769" y1="418.4922" y2="418.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="413.4263">bb1(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,443.625,660.5,447.625,670.5,451.625,666.5,447.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="774" y1="447.625" y2="447.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="442.5591">aa2(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L74" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L74" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="763,502.7578,773,506.7578,763,510.7578,767,506.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="769" y1="506.7578" y2="506.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="118" x="53" y="501.6919">bb2(int,std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,531.8906,660.5,535.8906,670.5,539.8906,666.5,535.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="774" y1="535.8906" y2="535.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="530.8247">aa1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L76" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L76" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="906,591.0234,916,595.0234,906,599.0234,910,595.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="912" y1="595.0234" y2="595.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="589.9575">bb1(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L46" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L46" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="928" x2="975" y1="619.1563" y2="619.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="975" x2="975" y1="619.1563" y2="632.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="934" x2="975" y1="632.1563" y2="632.1563"/>
       <polygon fill="#A80036" points="944,628.1563,934,632.1563,944,636.1563,940,632.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="940" y="614.0903">bb2(int,float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20006/t20006.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="670.5,662.2891,660.5,666.2891,670.5,670.2891,666.5,666.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="664.5" x2="922" y1="666.2891" y2="666.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="50" x="676.5" y="661.2231">aa2(int)</text>
diff --git a/docs/test_cases/t20007.md b/docs/test_cases/t20007.md
index 37f55b34..f00e6272 100644
--- a/docs/test_cases/t20007.md
+++ b/docs/test_cases/t20007.md
@@ -47,3 +47,125 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20007_sequence](./t20007_sequence.svg "Class template variadic argument list sequence diagram")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20007_sequence",
+  "participants": [
+    {
+      "id": "622662006747239840",
+      "name": "clanguml::t20007::tmain()",
+      "source_location": {
+        "file": "../../tests/t20007/t20007.cc",
+        "line": 11
+      },
+      "type": "function"
+    },
+    {
+      "id": "1742497005509009302",
+      "name": "clanguml::t20007::Adder<int,int>",
+      "source_location": {
+        "file": "../../tests/t20007/t20007.cc",
+        "line": 7
+      },
+      "type": "class"
+    },
+    {
+      "id": "599640474306956868",
+      "name": "clanguml::t20007::Adder<int,float,double>",
+      "source_location": {
+        "file": "../../tests/t20007/t20007.cc",
+        "line": 7
+      },
+      "type": "class"
+    },
+    {
+      "id": "228191787514523926",
+      "name": "clanguml::t20007::Adder<std::string,std::string,std::string>",
+      "source_location": {
+        "file": "../../tests/t20007/t20007.cc",
+        "line": 7
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "622662006747239840",
+            "activity_name": "clanguml::t20007::tmain()",
+            "participant_id": "622662006747239840",
+            "participant_name": "clanguml::t20007::tmain()"
+          },
+          "name": "add(int &&,int &&)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20007/t20007.cc",
+            "line": 19
+          },
+          "to": {
+            "activity_id": "438133719207269065",
+            "activity_name": "clanguml::t20007::Adder<int,int>::add(int &&,int &&)",
+            "participant_id": "1742497005509009302",
+            "participant_name": "clanguml::t20007::Adder<int,int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "622662006747239840",
+            "activity_name": "clanguml::t20007::tmain()",
+            "participant_id": "622662006747239840",
+            "participant_name": "clanguml::t20007::tmain()"
+          },
+          "name": "add(int &&,float &&,double &&)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20007/t20007.cc",
+            "line": 20
+          },
+          "to": {
+            "activity_id": "9522724767688870",
+            "activity_name": "clanguml::t20007::Adder<int,float,double>::add(int &&,float &&,double &&)",
+            "participant_id": "599640474306956868",
+            "participant_name": "clanguml::t20007::Adder<int,float,double>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "622662006747239840",
+            "activity_name": "clanguml::t20007::tmain()",
+            "participant_id": "622662006747239840",
+            "participant_name": "clanguml::t20007::tmain()"
+          },
+          "name": "add(std::string &&,std::string &&,std::string &&)",
+          "return_type": "class std::basic_string<char>",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20007/t20007.cc",
+            "line": 21
+          },
+          "to": {
+            "activity_id": "384866641042941480",
+            "activity_name": "clanguml::t20007::Adder<std::string,std::string,std::string>::add(std::string &&,std::string &&,std::string &&)",
+            "participant_id": "228191787514523926",
+            "participant_name": "clanguml::t20007::Adder<std::string,std::string,std::string>"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 622662006747239840,
+        "location": "clanguml::t20007::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20007"
+}
+```
diff --git a/docs/test_cases/t20007_sequence.svg b/docs/test_cases/t20007_sequence.svg
index 931fac7a..6c6e56fb 100644
--- a/docs/test_cases/t20007_sequence.svg
+++ b/docs/test_cases/t20007_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="227px" preserveAspectRatio="none" style="width:768px;height:227px;" version="1.1" viewBox="0 0 768 227" width="768px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f3vxm6z1ayurr" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1lafabumgxer6" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,57 +9,57 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f3vxm6z1ayurr)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f3vxm6z1ayurr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f3vxm6z1ayurr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f3vxm6z1ayurr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1lafabumgxer6)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lafabumgxer6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1lafabumgxer6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1lafabumgxer6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191.5" x2="191.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="354.5" x2="354.5" y1="38.2969" y2="187.6953"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="609.5" x2="609.5" y1="38.2969" y2="187.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vxm6z1ayurr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L11" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L11" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lafabumgxer6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f3vxm6z1ayurr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1lafabumgxer6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="206.6904">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vxm6z1ayurr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lafabumgxer6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="22.9951">Adder&lt;int,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f3vxm6z1ayurr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1lafabumgxer6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="117" x="131.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="103" x="138.5" y="206.6904">Adder&lt;int,int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vxm6z1ayurr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lafabumgxer6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="22.9951">Adder&lt;int,float,double&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f3vxm6z1ayurr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1lafabumgxer6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="181" x="262.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="167" x="269.5" y="206.6904">Adder&lt;int,float,double&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f3vxm6z1ayurr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L7" target="_top" title="Adder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L7" xlink:show="new" xlink:title="Adder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1lafabumgxer6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="22.9951">Adder&lt;std::string,std::string,std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f3vxm6z1ayurr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
+      <rect fill="#FEFECE" filter="url(#f1lafabumgxer6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="300" x="457.5" y="186.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="286" x="464.5" y="206.6904">Adder&lt;std::string,std::string,std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f3vxm6z1ayurr)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f3vxm6z1ayurr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f3vxm6z1ayurr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f3vxm6z1ayurr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1lafabumgxer6)" height="121.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1lafabumgxer6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="187" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1lafabumgxer6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="350" y="112.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1lafabumgxer6)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="604.5" y="155.6953"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="175,65.4297,185,69.4297,175,73.4297,179,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="181" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="122" x="53" y="64.3638">add(int &amp;&amp;,int &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,79.4297,47,83.4297,57,87.4297,53,83.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="191" y1="83.4297" y2="83.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="338,108.5625,348,112.5625,338,116.5625,342,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="344" y1="112.5625" y2="112.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="207" x="53" y="107.4966">add(int &amp;&amp;,float &amp;&amp;,double &amp;&amp;)</text>
     </a>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="354" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20007/t20007.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="592.5,151.6953,602.5,155.6953,592.5,159.6953,596.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="598.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="312" x="53" y="150.6294">add(std::string &amp;&amp;,std::string &amp;&amp;,std::string &amp;&amp;)</text>
diff --git a/docs/test_cases/t20008.md b/docs/test_cases/t20008.md
index e2ca37a0..033e8431 100644
--- a/docs/test_cases/t20008.md
+++ b/docs/test_cases/t20008.md
@@ -65,3 +65,218 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20008_sequence](./t20008_sequence.svg "Constexpr if sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20008_sequence",
+  "participants": [
+    {
+      "id": "1180776240543224244",
+      "name": "clanguml::t20008::tmain()",
+      "source_location": {
+        "file": "../../tests/t20008/t20008.cc",
+        "line": 30
+      },
+      "type": "function"
+    },
+    {
+      "id": "1906510289157013670",
+      "name": "clanguml::t20008::B<int>",
+      "source_location": {
+        "file": "../../tests/t20008/t20008.cc",
+        "line": 13
+      },
+      "type": "class"
+    },
+    {
+      "id": "1376149084762923197",
+      "name": "clanguml::t20008::A<int>",
+      "source_location": {
+        "file": "../../tests/t20008/t20008.cc",
+        "line": 7
+      },
+      "type": "class"
+    },
+    {
+      "id": "867098551202196741",
+      "name": "clanguml::t20008::B<const char *>",
+      "source_location": {
+        "file": "../../tests/t20008/t20008.cc",
+        "line": 13
+      },
+      "type": "class"
+    },
+    {
+      "id": "144833378017373200",
+      "name": "clanguml::t20008::A<const char *>",
+      "source_location": {
+        "file": "../../tests/t20008/t20008.cc",
+        "line": 7
+      },
+      "type": "class"
+    },
+    {
+      "id": "927702553742507923",
+      "name": "clanguml::t20008::B<std::string>",
+      "source_location": {
+        "file": "../../tests/t20008/t20008.cc",
+        "line": 13
+      },
+      "type": "class"
+    },
+    {
+      "id": "390605614583363778",
+      "name": "clanguml::t20008::A<std::string>",
+      "source_location": {
+        "file": "../../tests/t20008/t20008.cc",
+        "line": 7
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1180776240543224244",
+            "activity_name": "clanguml::t20008::tmain()",
+            "participant_id": "1180776240543224244",
+            "participant_name": "clanguml::t20008::tmain()"
+          },
+          "name": "b(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20008/t20008.cc",
+            "line": 38
+          },
+          "to": {
+            "activity_id": "379850145437051189",
+            "activity_name": "clanguml::t20008::B<int>::b(int)",
+            "participant_id": "1906510289157013670",
+            "participant_name": "clanguml::t20008::B<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "379850145437051189",
+            "activity_name": "clanguml::t20008::B<int>::b(int)",
+            "participant_id": "1906510289157013670",
+            "participant_name": "clanguml::t20008::B<int>"
+          },
+          "name": "a1(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20008/t20008.cc",
+            "line": 19
+          },
+          "to": {
+            "activity_id": "2066363630174644719",
+            "activity_name": "clanguml::t20008::A<int>::a1(int)",
+            "participant_id": "1376149084762923197",
+            "participant_name": "clanguml::t20008::A<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1180776240543224244",
+            "activity_name": "clanguml::t20008::tmain()",
+            "participant_id": "1180776240543224244",
+            "participant_name": "clanguml::t20008::tmain()"
+          },
+          "name": "b(const char *)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20008/t20008.cc",
+            "line": 39
+          },
+          "to": {
+            "activity_id": "1347162523481637780",
+            "activity_name": "clanguml::t20008::B<const char *>::b(const char *)",
+            "participant_id": "867098551202196741",
+            "participant_name": "clanguml::t20008::B<const char *>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1347162523481637780",
+            "activity_name": "clanguml::t20008::B<const char *>::b(const char *)",
+            "participant_id": "867098551202196741",
+            "participant_name": "clanguml::t20008::B<const char *>"
+          },
+          "name": "a2(const char *)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20008/t20008.cc",
+            "line": 22
+          },
+          "to": {
+            "activity_id": "718650834962275580",
+            "activity_name": "clanguml::t20008::A<const char *>::a2(const char *)",
+            "participant_id": "144833378017373200",
+            "participant_name": "clanguml::t20008::A<const char *>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1180776240543224244",
+            "activity_name": "clanguml::t20008::tmain()",
+            "participant_id": "1180776240543224244",
+            "participant_name": "clanguml::t20008::tmain()"
+          },
+          "name": "b(std::string)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20008/t20008.cc",
+            "line": 40
+          },
+          "to": {
+            "activity_id": "1286410946666951254",
+            "activity_name": "clanguml::t20008::B<std::string>::b(std::string)",
+            "participant_id": "927702553742507923",
+            "participant_name": "clanguml::t20008::B<std::string>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1286410946666951254",
+            "activity_name": "clanguml::t20008::B<std::string>::b(std::string)",
+            "participant_id": "927702553742507923",
+            "participant_name": "clanguml::t20008::B<std::string>"
+          },
+          "name": "a3(std::string)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20008/t20008.cc",
+            "line": 25
+          },
+          "to": {
+            "activity_id": "1404594247101138737",
+            "activity_name": "clanguml::t20008::A<std::string>::a3(std::string)",
+            "participant_id": "390605614583363778",
+            "participant_name": "clanguml::t20008::A<std::string>"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1180776240543224244,
+        "location": "clanguml::t20008::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20008"
+}
+```
diff --git a/docs/test_cases/t20008_sequence.svg b/docs/test_cases/t20008_sequence.svg
index 90eb3492..3082972e 100644
--- a/docs/test_cases/t20008_sequence.svg
+++ b/docs/test_cases/t20008_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:794px;height:363px;" version="1.1" viewBox="0 0 794 363" width="794px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f7g3ys91yquv3" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1f696hzeqeims" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="197" x2="197" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="454" x2="454" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="593" x2="593" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="726" x2="726" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="163" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="170" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="22.9951">B&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="132" x="241" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="118" x="248" y="342.0889">B&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="22.9951">A&lt;const char *&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="387" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="394" y="342.0889">A&lt;const char *&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="532" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="539" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f7g3ys91yquv3)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f1f696hzeqeims)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="665" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="672" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f7g3ys91yquv3)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="192" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="304" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="449.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="588.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1f696hzeqeims)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="721" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="180,94.5625,190,98.5625,180,102.5625,184,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="186" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="130.5" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L39" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L39" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="292,153.6953,302,157.6953,292,161.6953,296,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="298" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="53" y="152.6294">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="437.5,182.8281,447.5,186.8281,437.5,190.8281,441.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="314" x2="443.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="321" y="181.7622">a2(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="576.5,241.9609,586.5,245.9609,576.5,249.9609,580.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="582.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="240.895">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20008/t20008.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="709,271.0938,719,275.0938,709,279.0938,713,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="598.5" x2="715" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="90" x="605.5" y="270.0278">a3(std::string)</text>
diff --git a/docs/test_cases/t20009.md b/docs/test_cases/t20009.md
index e73dcf56..03b914e8 100644
--- a/docs/test_cases/t20009.md
+++ b/docs/test_cases/t20009.md
@@ -51,3 +51,218 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20009_sequence](./t20009_sequence.svg "Smart pointer dereference call expression test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20009_sequence",
+  "participants": [
+    {
+      "id": "791066686606379857",
+      "name": "clanguml::t20009::tmain()",
+      "source_location": {
+        "file": "../../tests/t20009/t20009.cc",
+        "line": 18
+      },
+      "type": "function"
+    },
+    {
+      "id": "450813573860627679",
+      "name": "clanguml::t20009::B<std::string>",
+      "source_location": {
+        "file": "../../tests/t20009/t20009.cc",
+        "line": 10
+      },
+      "type": "class"
+    },
+    {
+      "id": "1197403810800583218",
+      "name": "clanguml::t20009::A<std::string>",
+      "source_location": {
+        "file": "../../tests/t20009/t20009.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "2002310682025149090",
+      "name": "clanguml::t20009::B<int>",
+      "source_location": {
+        "file": "../../tests/t20009/t20009.cc",
+        "line": 10
+      },
+      "type": "class"
+    },
+    {
+      "id": "1228498754558363121",
+      "name": "clanguml::t20009::A<int>",
+      "source_location": {
+        "file": "../../tests/t20009/t20009.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "1461902328659683203",
+      "name": "clanguml::t20009::B<float>",
+      "source_location": {
+        "file": "../../tests/t20009/t20009.cc",
+        "line": 10
+      },
+      "type": "class"
+    },
+    {
+      "id": "1243520246309441967",
+      "name": "clanguml::t20009::A<float>",
+      "source_location": {
+        "file": "../../tests/t20009/t20009.cc",
+        "line": 6
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "791066686606379857",
+            "activity_name": "clanguml::t20009::tmain()",
+            "participant_id": "791066686606379857",
+            "participant_name": "clanguml::t20009::tmain()"
+          },
+          "name": "b(std::string)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20009/t20009.cc",
+            "line": 24
+          },
+          "to": {
+            "activity_id": "1960266381909090879",
+            "activity_name": "clanguml::t20009::B<std::string>::b(std::string)",
+            "participant_id": "450813573860627679",
+            "participant_name": "clanguml::t20009::B<std::string>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1960266381909090879",
+            "activity_name": "clanguml::t20009::B<std::string>::b(std::string)",
+            "participant_id": "450813573860627679",
+            "participant_name": "clanguml::t20009::B<std::string>"
+          },
+          "name": "a(std::string)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20009/t20009.cc",
+            "line": 11
+          },
+          "to": {
+            "activity_id": "1716775846967761286",
+            "activity_name": "clanguml::t20009::A<std::string>::a(std::string)",
+            "participant_id": "1197403810800583218",
+            "participant_name": "clanguml::t20009::A<std::string>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "791066686606379857",
+            "activity_name": "clanguml::t20009::tmain()",
+            "participant_id": "791066686606379857",
+            "participant_name": "clanguml::t20009::tmain()"
+          },
+          "name": "b(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20009/t20009.cc",
+            "line": 25
+          },
+          "to": {
+            "activity_id": "660557928399203634",
+            "activity_name": "clanguml::t20009::B<int>::b(int)",
+            "participant_id": "2002310682025149090",
+            "participant_name": "clanguml::t20009::B<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "660557928399203634",
+            "activity_name": "clanguml::t20009::B<int>::b(int)",
+            "participant_id": "2002310682025149090",
+            "participant_name": "clanguml::t20009::B<int>"
+          },
+          "name": "a(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20009/t20009.cc",
+            "line": 11
+          },
+          "to": {
+            "activity_id": "2030629454810805092",
+            "activity_name": "clanguml::t20009::A<int>::a(int)",
+            "participant_id": "1228498754558363121",
+            "participant_name": "clanguml::t20009::A<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "791066686606379857",
+            "activity_name": "clanguml::t20009::tmain()",
+            "participant_id": "791066686606379857",
+            "participant_name": "clanguml::t20009::tmain()"
+          },
+          "name": "b(float)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20009/t20009.cc",
+            "line": 26
+          },
+          "to": {
+            "activity_id": "367805163135583282",
+            "activity_name": "clanguml::t20009::B<float>::b(float)",
+            "participant_id": "1461902328659683203",
+            "participant_name": "clanguml::t20009::B<float>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "367805163135583282",
+            "activity_name": "clanguml::t20009::B<float>::b(float)",
+            "participant_id": "1461902328659683203",
+            "participant_name": "clanguml::t20009::B<float>"
+          },
+          "name": "a(float)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20009/t20009.cc",
+            "line": 11
+          },
+          "to": {
+            "activity_id": "1643733911490581293",
+            "activity_name": "clanguml::t20009::A<float>::a(float)",
+            "participant_id": "1243520246309441967",
+            "participant_name": "clanguml::t20009::A<float>"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 791066686606379857,
+        "location": "clanguml::t20009::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20009"
+}
+```
diff --git a/docs/test_cases/t20009_sequence.svg b/docs/test_cases/t20009_sequence.svg
index ddf296cb..228e46bc 100644
--- a/docs/test_cases/t20009_sequence.svg
+++ b/docs/test_cases/t20009_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="363px" preserveAspectRatio="none" style="width:690px;height:363px;" version="1.1" viewBox="0 0 690 363" width="690px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f9dac92awc27y" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4qbjcnja5ah5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,13 +9,13 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="151.5" x2="151.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="284.5" x2="284.5" y1="38.2969" y2="323.0938"/>
@@ -23,81 +23,81 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="468.5" x2="468.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="552.5" x2="552.5" y1="38.2969" y2="323.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="643.5" x2="643.5" y1="38.2969" y2="323.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="342.0889">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="22.9951">B&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="119" x="90.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="105" x="97.5" y="342.0889">B&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="22.9951">A&lt;std::string&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="118" x="223.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="104" x="230.5" y="342.0889">A&lt;std::string&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="355.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="362.5" y="342.0889">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="22.9951">A&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="64" x="434.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="50" x="441.5" y="342.0889">A&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="22.9951">B&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="77" x="512.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="63" x="519.5" y="342.0889">B&lt;float&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="22.9951">A&lt;float&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f9dac92awc27y)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
+      <rect fill="#FEFECE" filter="url(#f4qbjcnja5ah5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="76" x="603.5" y="322.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="62" x="610.5" y="342.0889">A&lt;float&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f9dac92awc27y)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="256.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="147" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="279.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="385" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="463.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="548" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f4qbjcnja5ah5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="638.5" y="275.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="135,65.4297,145,69.4297,135,73.4297,139,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="141" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="53" y="64.3638">b(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="267.5,94.5625,277.5,98.5625,267.5,102.5625,271.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="157" x2="273.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="82" x="164" y="93.4966">a(std::string)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="373,153.6953,383,157.6953,373,161.6953,377,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="379" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="152.6294">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="451.5,182.8281,461.5,186.8281,451.5,190.8281,455.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="395" x2="457.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="402" y="181.7622">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="536,241.9609,546,245.9609,536,249.9609,540,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="542" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="53" y="240.895">b(float)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20009/t20009.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="626.5,271.0938,636.5,275.0938,626.5,279.0938,630.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558" x2="632.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="46" x="565" y="270.0278">a(float)</text>
diff --git a/docs/test_cases/t20010.md b/docs/test_cases/t20010.md
index 0a067b96..c9d3ece1 100644
--- a/docs/test_cases/t20010.md
+++ b/docs/test_cases/t20010.md
@@ -61,3 +61,226 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20010_sequence](./t20010_sequence.svg "Container sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20010_sequence",
+  "participants": [
+    {
+      "id": "1364660609791735244",
+      "name": "clanguml::t20010::tmain()",
+      "source_location": {
+        "file": "../../tests/t20010/t20010.cc",
+        "line": 28
+      },
+      "type": "function"
+    },
+    {
+      "id": "2154977200904210115",
+      "name": "clanguml::t20010::B<int>",
+      "source_location": {
+        "file": "../../tests/t20010/t20010.cc",
+        "line": 16
+      },
+      "type": "class"
+    },
+    {
+      "id": "102070351492425113",
+      "name": "clanguml::t20010::A",
+      "source_location": {
+        "file": "../../tests/t20010/t20010.cc",
+        "line": 9
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1364660609791735244",
+            "activity_name": "clanguml::t20010::tmain()",
+            "participant_id": "1364660609791735244",
+            "participant_name": "clanguml::t20010::tmain()"
+          },
+          "name": "b1()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20010/t20010.cc",
+            "line": 32
+          },
+          "to": {
+            "activity_id": "343626060927491836",
+            "activity_name": "clanguml::t20010::B<int>::b1()",
+            "participant_id": "2154977200904210115",
+            "participant_name": "clanguml::t20010::B<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "343626060927491836",
+            "activity_name": "clanguml::t20010::B<int>::b1()",
+            "participant_id": "2154977200904210115",
+            "participant_name": "clanguml::t20010::B<int>"
+          },
+          "name": "a1()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20010/t20010.cc",
+            "line": 17
+          },
+          "to": {
+            "activity_id": "981184681827469850",
+            "activity_name": "clanguml::t20010::A::a1()",
+            "participant_id": "102070351492425113",
+            "participant_name": "clanguml::t20010::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1364660609791735244",
+            "activity_name": "clanguml::t20010::tmain()",
+            "participant_id": "1364660609791735244",
+            "participant_name": "clanguml::t20010::tmain()"
+          },
+          "name": "b2()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20010/t20010.cc",
+            "line": 33
+          },
+          "to": {
+            "activity_id": "1633031113603062043",
+            "activity_name": "clanguml::t20010::B<int>::b2()",
+            "participant_id": "2154977200904210115",
+            "participant_name": "clanguml::t20010::B<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1633031113603062043",
+            "activity_name": "clanguml::t20010::B<int>::b2()",
+            "participant_id": "2154977200904210115",
+            "participant_name": "clanguml::t20010::B<int>"
+          },
+          "name": "a2()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20010/t20010.cc",
+            "line": 18
+          },
+          "to": {
+            "activity_id": "664370880632146592",
+            "activity_name": "clanguml::t20010::A::a2()",
+            "participant_id": "102070351492425113",
+            "participant_name": "clanguml::t20010::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1364660609791735244",
+            "activity_name": "clanguml::t20010::tmain()",
+            "participant_id": "1364660609791735244",
+            "participant_name": "clanguml::t20010::tmain()"
+          },
+          "name": "b3()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20010/t20010.cc",
+            "line": 34
+          },
+          "to": {
+            "activity_id": "786218543654309692",
+            "activity_name": "clanguml::t20010::B<int>::b3()",
+            "participant_id": "2154977200904210115",
+            "participant_name": "clanguml::t20010::B<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "786218543654309692",
+            "activity_name": "clanguml::t20010::B<int>::b3()",
+            "participant_id": "2154977200904210115",
+            "participant_name": "clanguml::t20010::B<int>"
+          },
+          "name": "a3()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20010/t20010.cc",
+            "line": 19
+          },
+          "to": {
+            "activity_id": "2145739294823015899",
+            "activity_name": "clanguml::t20010::A::a3()",
+            "participant_id": "102070351492425113",
+            "participant_name": "clanguml::t20010::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1364660609791735244",
+            "activity_name": "clanguml::t20010::tmain()",
+            "participant_id": "1364660609791735244",
+            "participant_name": "clanguml::t20010::tmain()"
+          },
+          "name": "b4()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20010/t20010.cc",
+            "line": 35
+          },
+          "to": {
+            "activity_id": "1866068965397702666",
+            "activity_name": "clanguml::t20010::B<int>::b4()",
+            "participant_id": "2154977200904210115",
+            "participant_name": "clanguml::t20010::B<int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1866068965397702666",
+            "activity_name": "clanguml::t20010::B<int>::b4()",
+            "participant_id": "2154977200904210115",
+            "participant_name": "clanguml::t20010::B<int>"
+          },
+          "name": "a4()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20010/t20010.cc",
+            "line": 20
+          },
+          "to": {
+            "activity_id": "1224936485834400821",
+            "activity_name": "clanguml::t20010::A::a4()",
+            "participant_id": "102070351492425113",
+            "participant_name": "clanguml::t20010::A"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1364660609791735244,
+        "location": "clanguml::t20010::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20010"
+}
+```
diff --git a/docs/test_cases/t20010_sequence.svg b/docs/test_cases/t20010_sequence.svg
index 020e4ec8..f6da7b82 100644
--- a/docs/test_cases/t20010_sequence.svg
+++ b/docs/test_cases/t20010_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:197px;height:451px;" version="1.1" viewBox="0 0 197 451" width="197px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fr2vukh708d28" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f17vqwbzaiqtnv" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,81 +9,81 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="118" x2="118" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="176" x2="176" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr2vukh708d28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17vqwbzaiqtnv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fr2vukh708d28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f17vqwbzaiqtnv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr2vukh708d28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17vqwbzaiqtnv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="22.9951">B&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fr2vukh708d28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f17vqwbzaiqtnv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="65" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="51" x="91" y="430.3545">B&lt;int&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fr2vukh708d28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17vqwbzaiqtnv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fr2vukh708d28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f17vqwbzaiqtnv)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="163" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="170" y="430.3545">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fr2vukh708d28)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="113.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f17vqwbzaiqtnv)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="171.5" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,65.4297,111.5,69.4297,101.5,73.4297,105.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="64.3638">b1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,94.5625,169.5,98.5625,159.5,102.5625,163.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="93.4966">a1()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L33" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L33" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,153.6953,111.5,157.6953,101.5,161.6953,105.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="152.6294">b2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,182.8281,169.5,186.8281,159.5,190.8281,163.5,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="181.7622">a2()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,241.9609,111.5,245.9609,101.5,249.9609,105.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="240.895">b3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,271.0938,169.5,275.0938,159.5,279.0938,163.5,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="270.0278">a3()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="101.5,330.2266,111.5,334.2266,101.5,338.2266,105.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="107.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="53" y="329.1606">b4()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20010/t20010.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="159.5,359.3594,169.5,363.3594,159.5,367.3594,163.5,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="123.5" x2="165.5" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="130.5" y="358.2935">a4()</text>
diff --git a/docs/test_cases/t20011.md b/docs/test_cases/t20011.md
index 3c9f43ef..cd14b480 100644
--- a/docs/test_cases/t20011.md
+++ b/docs/test_cases/t20011.md
@@ -53,3 +53,219 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20011_sequence](./t20011_sequence.svg "Recursive calls sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20011_sequence",
+  "participants": [
+    {
+      "id": "1866210527166391126",
+      "name": "clanguml::t20011::tmain()",
+      "source_location": {
+        "file": "../../tests/t20011/t20011.cc",
+        "line": 22
+      },
+      "type": "function"
+    },
+    {
+      "id": "816061502062128285",
+      "name": "clanguml::t20011::A",
+      "source_location": {
+        "file": "../../tests/t20011/t20011.cc",
+        "line": 4
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1866210527166391126",
+            "activity_name": "clanguml::t20011::tmain()",
+            "participant_id": "1866210527166391126",
+            "participant_name": "clanguml::t20011::tmain()"
+          },
+          "name": "a(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20011/t20011.cc",
+            "line": 26
+          },
+          "to": {
+            "activity_id": "1647578261840204206",
+            "activity_name": "clanguml::t20011::A::a(int)",
+            "participant_id": "816061502062128285",
+            "participant_name": "clanguml::t20011::A"
+          },
+          "type": "message"
+        },
+        {
+          "activity_id": "1647578261840204206",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "1647578261840204206",
+                    "activity_name": "clanguml::t20011::A::a(int)",
+                    "participant_id": "816061502062128285",
+                    "participant_name": "clanguml::t20011::A"
+                  },
+                  "name": "a(int)",
+                  "return_type": "void",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20011/t20011.cc",
+                    "line": 8
+                  },
+                  "to": {
+                    "activity_id": "1647578261840204206",
+                    "activity_name": "clanguml::t20011::A::a(int)",
+                    "participant_id": "816061502062128285",
+                    "participant_name": "clanguml::t20011::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "consequent"
+            }
+          ],
+          "name": "if",
+          "type": "alt"
+        },
+        {
+          "from": {
+            "activity_id": "1866210527166391126",
+            "activity_name": "clanguml::t20011::tmain()",
+            "participant_id": "1866210527166391126",
+            "participant_name": "clanguml::t20011::tmain()"
+          },
+          "name": "b(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20011/t20011.cc",
+            "line": 28
+          },
+          "to": {
+            "activity_id": "305456175818875420",
+            "activity_name": "clanguml::t20011::A::b(int)",
+            "participant_id": "816061502062128285",
+            "participant_name": "clanguml::t20011::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "305456175818875420",
+            "activity_name": "clanguml::t20011::A::b(int)",
+            "participant_id": "816061502062128285",
+            "participant_name": "clanguml::t20011::A"
+          },
+          "name": "c(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20011/t20011.cc",
+            "line": 11
+          },
+          "to": {
+            "activity_id": "963268672079901211",
+            "activity_name": "clanguml::t20011::A::c(int)",
+            "participant_id": "816061502062128285",
+            "participant_name": "clanguml::t20011::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "963268672079901211",
+            "activity_name": "clanguml::t20011::A::c(int)",
+            "participant_id": "816061502062128285",
+            "participant_name": "clanguml::t20011::A"
+          },
+          "name": "d(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20011/t20011.cc",
+            "line": 12
+          },
+          "to": {
+            "activity_id": "1874311762268001137",
+            "activity_name": "clanguml::t20011::A::d(int)",
+            "participant_id": "816061502062128285",
+            "participant_name": "clanguml::t20011::A"
+          },
+          "type": "message"
+        },
+        {
+          "activity_id": "1874311762268001137",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "1874311762268001137",
+                    "activity_name": "clanguml::t20011::A::d(int)",
+                    "participant_id": "816061502062128285",
+                    "participant_name": "clanguml::t20011::A"
+                  },
+                  "name": "b(int)",
+                  "return_type": "void",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20011/t20011.cc",
+                    "line": 16
+                  },
+                  "to": {
+                    "activity_id": "305456175818875420",
+                    "activity_name": "clanguml::t20011::A::b(int)",
+                    "participant_id": "816061502062128285",
+                    "participant_name": "clanguml::t20011::A"
+                  },
+                  "type": "message"
+                },
+                {
+                  "from": {
+                    "activity_id": "1874311762268001137",
+                    "activity_name": "clanguml::t20011::A::d(int)",
+                    "participant_id": "816061502062128285",
+                    "participant_name": "clanguml::t20011::A"
+                  },
+                  "name": "a(int)",
+                  "return_type": "void",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20011/t20011.cc",
+                    "line": 18
+                  },
+                  "to": {
+                    "activity_id": "1647578261840204206",
+                    "activity_name": "clanguml::t20011::A::a(int)",
+                    "participant_id": "816061502062128285",
+                    "participant_name": "clanguml::t20011::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "consequent"
+            }
+          ],
+          "name": "if",
+          "type": "alt"
+        }
+      ],
+      "start_from": {
+        "id": 1866210527166391126,
+        "location": "clanguml::t20011::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20011"
+}
+```
diff --git a/docs/test_cases/t20011_sequence.svg b/docs/test_cases/t20011_sequence.svg
index 13bf80a0..66ec6fdb 100644
--- a/docs/test_cases/t20011_sequence.svg
+++ b/docs/test_cases/t20011_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="593px" preserveAspectRatio="none" style="width:203px;height:593px;" version="1.1" viewBox="0 0 203 593" width="203px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fg7wmv6awvv2c" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1j9rsqdinynco" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,42 +9,42 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="552.7578"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="103.5" x2="103.5" y1="38.2969" y2="552.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg7wmv6awvv2c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L22" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L22" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1j9rsqdinynco)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fg7wmv6awvv2c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#f1j9rsqdinynco)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="571.7529">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fg7wmv6awvv2c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1j9rsqdinynco)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fg7wmv6awvv2c)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
+      <rect fill="#FEFECE" filter="url(#f1j9rsqdinynco)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="90.5" y="551.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="97.5" y="571.7529">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fg7wmv6awvv2c)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="494.4609" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="111.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="340.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="99" y="201.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="303.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="104" y="238.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="261.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="109" y="281.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="347.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="116.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="114" y="419.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1j9rsqdinynco)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="119" y="485.7578"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,65.4297,97,69.4297,87,73.4297,91,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="64.3638">a(int)</text>
@@ -52,26 +52,26 @@
     <path d="M80.5,84.4297 L144.5,84.4297 L144.5,91.4297 L134.5,101.4297 L80.5,101.4297 L80.5,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="86.5" x="80.5" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="97.4966">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="156" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="125,131.6953,115,135.6953,125,139.6953,121,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="121" y="117.6294">a(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="87,197.8281,97,201.8281,87,205.8281,91,201.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="93" y1="201.8281" y2="201.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="53" y="196.7622">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="109" x2="156" y1="225.9609" y2="225.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="156" x2="156" y1="225.9609" y2="238.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="115" x2="156" y1="238.9609" y2="238.9609"/>
       <polygon fill="#A80036" points="125,234.9609,115,238.9609,125,242.9609,121,238.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="33" x="121" y="220.895">c(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="114" x2="161" y1="268.0938" y2="268.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="161" x2="161" y1="268.0938" y2="281.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="120" x2="161" y1="281.0938" y2="281.0938"/>
@@ -81,14 +81,14 @@
     <path d="M70.5,301.0938 L134.5,301.0938 L134.5,308.0938 L124.5,318.0938 L70.5,318.0938 L70.5,301.0938 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.6641" style="stroke: #000000; stroke-width: 2.0;" width="121.5" x="70.5" y="301.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="85.5" y="314.1606">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="124" x2="166" y1="339.3594" y2="339.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="339.3594" y2="352.3594"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="352.3594" y2="352.3594"/>
       <polygon fill="#A80036" points="135,348.3594,125,352.3594,135,356.3594,131,352.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="131" y="334.2935">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="119" x2="166" y1="406.4922" y2="406.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="166" x2="166" y1="406.4922" y2="419.4922"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="125" x2="166" y1="419.4922" y2="419.4922"/>
@@ -98,7 +98,7 @@
     <path d="M80.5,439.4922 L144.5,439.4922 L144.5,446.4922 L134.5,456.4922 L80.5,456.4922 L80.5,439.4922 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="89.2656" style="stroke: #000000; stroke-width: 2.0;" width="101.5" x="80.5" y="439.4922"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="95.5" y="452.5591">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L8" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20011/t20011.cc#L8" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="129" x2="171" y1="477.7578" y2="477.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="171" x2="171" y1="477.7578" y2="490.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="171" y1="490.7578" y2="490.7578"/>
diff --git a/docs/test_cases/t20012.md b/docs/test_cases/t20012.md
index a874e7a7..ffe5f498 100644
--- a/docs/test_cases/t20012.md
+++ b/docs/test_cases/t20012.md
@@ -126,3 +126,456 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20012_sequence](./t20012_sequence.svg "Lambda expression call sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20012_sequence",
+  "participants": [
+    {
+      "id": "893699278278125827",
+      "name": "clanguml::t20012::tmain()",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 58
+      },
+      "type": "function"
+    },
+    {
+      "id": "871571755123349249",
+      "name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 66
+      },
+      "type": "class"
+    },
+    {
+      "id": "1798184226128732119",
+      "name": "clanguml::t20012::A",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 9
+      },
+      "type": "class"
+    },
+    {
+      "id": "1893469899260202653",
+      "name": "clanguml::t20012::B",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 17
+      },
+      "type": "class"
+    },
+    {
+      "id": "516948909715002916",
+      "name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 79
+      },
+      "type": "class"
+    },
+    {
+      "id": "2071958121786360262",
+      "name": "clanguml::t20012::C",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 27
+      },
+      "type": "class"
+    },
+    {
+      "id": "1639905845562724067",
+      "name": "clanguml::t20012::R<R::(lambda ../../tests/t20012/t20012.cc:85:9)>",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 47
+      },
+      "type": "class"
+    },
+    {
+      "id": "105322683015690128",
+      "name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 85
+      },
+      "type": "class"
+    },
+    {
+      "id": "1627226326147373737",
+      "name": "clanguml::t20012::D",
+      "source_location": {
+        "file": "../../tests/t20012/t20012.cc",
+        "line": 35
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "893699278278125827",
+            "activity_name": "clanguml::t20012::tmain()",
+            "participant_id": "893699278278125827",
+            "participant_name": "clanguml::t20012::tmain()"
+          },
+          "name": "operator()()",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 72
+          },
+          "to": {
+            "activity_id": "601151241333493101",
+            "activity_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)::operator()()",
+            "participant_id": "871571755123349249",
+            "participant_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "601151241333493101",
+            "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)::operator()()",
+            "participant_id": "871571755123349249",
+            "participant_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)"
+          },
+          "name": "a()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 67
+          },
+          "to": {
+            "activity_id": "1871432932744498976",
+            "activity_name": "clanguml::t20012::A::a()",
+            "participant_id": "1798184226128732119",
+            "participant_name": "clanguml::t20012::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1871432932744498976",
+            "activity_name": "clanguml::t20012::A::a()",
+            "participant_id": "1798184226128732119",
+            "participant_name": "clanguml::t20012::A"
+          },
+          "name": "aa()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 10
+          },
+          "to": {
+            "activity_id": "1100933039353876539",
+            "activity_name": "clanguml::t20012::A::aa()",
+            "participant_id": "1798184226128732119",
+            "participant_name": "clanguml::t20012::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1100933039353876539",
+            "activity_name": "clanguml::t20012::A::aa()",
+            "participant_id": "1798184226128732119",
+            "participant_name": "clanguml::t20012::A"
+          },
+          "name": "aaa()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 12
+          },
+          "to": {
+            "activity_id": "941636185823691898",
+            "activity_name": "clanguml::t20012::A::aaa()",
+            "participant_id": "1798184226128732119",
+            "participant_name": "clanguml::t20012::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "601151241333493101",
+            "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)::operator()()",
+            "participant_id": "871571755123349249",
+            "participant_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)"
+          },
+          "name": "b()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 68
+          },
+          "to": {
+            "activity_id": "2142697410385270633",
+            "activity_name": "clanguml::t20012::B::b()",
+            "participant_id": "1893469899260202653",
+            "participant_name": "clanguml::t20012::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2142697410385270633",
+            "activity_name": "clanguml::t20012::B::b()",
+            "participant_id": "1893469899260202653",
+            "participant_name": "clanguml::t20012::B"
+          },
+          "name": "bb()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 18
+          },
+          "to": {
+            "activity_id": "973718340784931313",
+            "activity_name": "clanguml::t20012::B::bb()",
+            "participant_id": "1893469899260202653",
+            "participant_name": "clanguml::t20012::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "973718340784931313",
+            "activity_name": "clanguml::t20012::B::bb()",
+            "participant_id": "1893469899260202653",
+            "participant_name": "clanguml::t20012::B"
+          },
+          "name": "bbb()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 20
+          },
+          "to": {
+            "activity_id": "195788529004378403",
+            "activity_name": "clanguml::t20012::B::bbb()",
+            "participant_id": "1893469899260202653",
+            "participant_name": "clanguml::t20012::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "893699278278125827",
+            "activity_name": "clanguml::t20012::tmain()",
+            "participant_id": "893699278278125827",
+            "participant_name": "clanguml::t20012::tmain()"
+          },
+          "name": "operator()()",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 83
+          },
+          "to": {
+            "activity_id": "435249756897748529",
+            "activity_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)::operator()()",
+            "participant_id": "516948909715002916",
+            "participant_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "435249756897748529",
+            "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)::operator()()",
+            "participant_id": "516948909715002916",
+            "participant_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)"
+          },
+          "name": "c()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 80
+          },
+          "to": {
+            "activity_id": "675369415318225607",
+            "activity_name": "clanguml::t20012::C::c()",
+            "participant_id": "2071958121786360262",
+            "participant_name": "clanguml::t20012::C"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "675369415318225607",
+            "activity_name": "clanguml::t20012::C::c()",
+            "participant_id": "2071958121786360262",
+            "participant_name": "clanguml::t20012::C"
+          },
+          "name": "cc()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 28
+          },
+          "to": {
+            "activity_id": "1451821704315336057",
+            "activity_name": "clanguml::t20012::C::cc()",
+            "participant_id": "2071958121786360262",
+            "participant_name": "clanguml::t20012::C"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1451821704315336057",
+            "activity_name": "clanguml::t20012::C::cc()",
+            "participant_id": "2071958121786360262",
+            "participant_name": "clanguml::t20012::C"
+          },
+          "name": "ccc()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 30
+          },
+          "to": {
+            "activity_id": "1956141408799600460",
+            "activity_name": "clanguml::t20012::C::ccc()",
+            "participant_id": "2071958121786360262",
+            "participant_name": "clanguml::t20012::C"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "435249756897748529",
+            "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)::operator()()",
+            "participant_id": "516948909715002916",
+            "participant_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)"
+          },
+          "name": "operator()()",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 81
+          },
+          "to": {
+            "activity_id": "601151241333493101",
+            "activity_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)::operator()()",
+            "participant_id": "871571755123349249",
+            "participant_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "893699278278125827",
+            "activity_name": "clanguml::t20012::tmain()",
+            "participant_id": "893699278278125827",
+            "participant_name": "clanguml::t20012::tmain()"
+          },
+          "name": "r()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 87
+          },
+          "to": {
+            "activity_id": "1003931867044486762",
+            "activity_name": "clanguml::t20012::R<R##(lambda ../../tests/t20012/t20012.cc:85:9)>::r()",
+            "participant_id": "1639905845562724067",
+            "participant_name": "clanguml::t20012::R<R##(lambda ../../tests/t20012/t20012.cc:85:9)>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1003931867044486762",
+            "activity_name": "clanguml::t20012::R<R::(lambda ../../tests/t20012/t20012.cc:85:9)>::r()",
+            "participant_id": "1639905845562724067",
+            "participant_name": "clanguml::t20012::R<R::(lambda ../../tests/t20012/t20012.cc:85:9)>"
+          },
+          "name": "operator()()",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 53
+          },
+          "to": {
+            "activity_id": "31472345599504206",
+            "activity_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)::operator()()",
+            "participant_id": "105322683015690128",
+            "participant_name": "clanguml::t20012::tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "31472345599504206",
+            "activity_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)::operator()()",
+            "participant_id": "105322683015690128",
+            "participant_name": "clanguml::t20012::tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)"
+          },
+          "name": "c()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 85
+          },
+          "to": {
+            "activity_id": "675369415318225607",
+            "activity_name": "clanguml::t20012::C::c()",
+            "participant_id": "2071958121786360262",
+            "participant_name": "clanguml::t20012::C"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "893699278278125827",
+            "activity_name": "clanguml::t20012::tmain()",
+            "participant_id": "893699278278125827",
+            "participant_name": "clanguml::t20012::tmain()"
+          },
+          "name": "add5(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20012/t20012.cc",
+            "line": 93
+          },
+          "to": {
+            "activity_id": "1355013132527568474",
+            "activity_name": "clanguml::t20012::D::add5(int)",
+            "participant_id": "1627226326147373737",
+            "participant_name": "clanguml::t20012::D"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 893699278278125827,
+        "location": "clanguml::t20012::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20012"
+}
+```
diff --git a/docs/test_cases/t20012_sequence.svg b/docs/test_cases/t20012_sequence.svg
index 33bc84c6..cbd04446 100644
--- a/docs/test_cases/t20012_sequence.svg
+++ b/docs/test_cases/t20012_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="1203px" preserveAspectRatio="none" style="width:1784px;height:1203px;" version="1.1" viewBox="0 0 1784 1203" width="1784px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fxeizynl48qle" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f17p9sjooriaiz" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,31 +9,31 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="272" x2="272" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="484" x2="484" y1="38.2969" y2="1163.4844"/>
@@ -43,122 +43,122 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1178.5" x2="1178.5" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1554.5" x2="1554.5" y1="38.2969" y2="1163.4844"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="1762.5" x2="1762.5" y1="38.2969" y2="1163.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L58" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L58" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L58" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L58" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="1182.4795">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L66" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L66" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L66" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L66" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:66:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="91" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="84" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="91" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:66:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="478" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="471" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="478" y="1182.4795">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L17" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L17" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="540.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="533.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="540.5" y="1182.4795">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L79" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L79" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L79" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L79" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:79:20)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="578.5" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="373" x="571.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="359" x="578.5" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:79:20)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L27" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L27" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="965.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="958.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="965.5" y="1182.4795">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L47" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L47" xlink:show="new" xlink:title="R" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L47" target="_top" title="R" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L47" xlink:show="new" xlink:title="R" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="346" x="1003.5" y="22.9951">R&lt;R::(lambda ../../tests/t20012/t20012.cc:85:9)&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="360" x="996.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="346" x="1003.5" y="1182.4795">R&lt;R::(lambda ../../tests/t20012/t20012.cc:85:9)&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L85" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L85" target="_top" title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="tmain()##(lambda ../../tests/t20012/t20012.cc:85:9)" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="350" x="1377.5" y="22.9951">tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="364" x="1370.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="350" x="1377.5" y="1182.4795">tmain()::(lambda ../../tests/t20012/t20012.cc:85:9)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L35" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L35" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="1755.5" y="22.9951">D</text>
-      <rect fill="#FEFECE" filter="url(#fxeizynl48qle)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="1162.4844"/>
+      <rect fill="#FEFECE" filter="url(#f17p9sjooriaiz)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="25" x="1748.5" y="1162.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="11" x="1755.5" y="1182.4795">D</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
-    <rect fill="#FFFFFF" filter="url(#fxeizynl48qle)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="1097.1875" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="300.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="267.5" y="571.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="135.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="177.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="479.5" y="601.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="484.5" y="638.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="489.5" y="680.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="279.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="321.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="542.5" y="744.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="547.5" y="781.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="552.5" y="823.6875"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="487.3281" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="755" y="399.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="428.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="465.625"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="507.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="107.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="967.5" y="974.0859"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="70.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="972.5" y="1011.2188"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="977.5" y="1053.3516"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="186.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1173.5" y="915.8203"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="157.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1549.5" y="944.9531"/>
+    <rect fill="#FFFFFF" filter="url(#f17p9sjooriaiz)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="1758" y="1131.4844"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L72" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L72" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="255.5,65.4297,265.5,69.4297,255.5,73.4297,259.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="261.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="64.3638">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="467.5,94.5625,477.5,98.5625,467.5,102.5625,471.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="473.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="93.4966">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="489.5" x2="536.5" y1="122.6953" y2="122.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="536.5" x2="536.5" y1="122.6953" y2="135.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="495.5" x2="536.5" y1="135.6953" y2="135.6953"/>
       <polygon fill="#A80036" points="505.5,131.6953,495.5,135.6953,505.5,139.6953,501.5,135.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="501.5" y="117.6294">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="499.5" x2="541.5" y1="169.8281" y2="169.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="541.5" x2="541.5" y1="169.8281" y2="182.8281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="500.5" x2="541.5" y1="182.8281" y2="182.8281"/>
       <polygon fill="#A80036" points="510.5,178.8281,500.5,182.8281,510.5,186.8281,506.5,182.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="506.5" y="164.7622">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="530.5,237.9609,540.5,241.9609,530.5,245.9609,534.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="536.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="236.895">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="552.5" x2="599.5" y1="266.0938" y2="266.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="599.5" x2="599.5" y1="266.0938" y2="279.0938"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558.5" x2="599.5" y1="279.0938" y2="279.0938"/>
       <polygon fill="#A80036" points="568.5,275.0938,558.5,279.0938,568.5,283.0938,564.5,279.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="564.5" y="261.0278">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="562.5" x2="604.5" y1="313.2266" y2="313.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="604.5" x2="604.5" y1="313.2266" y2="326.2266"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="563.5" x2="604.5" y1="326.2266" y2="326.2266"/>
@@ -167,67 +167,67 @@
     </a>
     <polygon fill="#A80036" points="57,366.2266,47,370.2266,57,374.2266,53,370.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="271.5" y1="370.2266" y2="370.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L83" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L83" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L83" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L83" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="743,395.3594,753,399.3594,743,403.3594,747,399.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="749" y1="399.3594" y2="399.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="53" y="394.2935">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L80" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L80" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L80" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="955.5,424.4922,965.5,428.4922,955.5,432.4922,959.5,428.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="765" x2="961.5" y1="428.4922" y2="428.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="772" y="423.4263">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="977.5" x2="1024.5" y1="452.625" y2="452.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1024.5" x2="1024.5" y1="452.625" y2="465.625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="983.5" x2="1024.5" y1="465.625" y2="465.625"/>
       <polygon fill="#A80036" points="993.5,461.625,983.5,465.625,993.5,469.625,989.5,465.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="989.5" y="447.5591">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="987.5" x2="1029.5" y1="499.7578" y2="499.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1029.5" x2="1029.5" y1="499.7578" y2="512.7578"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="988.5" x2="1029.5" y1="512.7578" y2="512.7578"/>
       <polygon fill="#A80036" points="998.5,508.7578,988.5,512.7578,998.5,516.7578,994.5,512.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="31" x="994.5" y="494.6919">ccc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L81" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L81" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="288.5,567.8906,278.5,571.8906,288.5,575.8906,284.5,571.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282.5" x2="754" y1="571.8906" y2="571.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="294.5" y="566.8247">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L67" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L67" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="467.5,597.0234,477.5,601.0234,467.5,605.0234,471.5,601.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="473.5" y1="601.0234" y2="601.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="595.9575">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L10" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L10" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="489.5" x2="536.5" y1="625.1563" y2="625.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="536.5" x2="536.5" y1="625.1563" y2="638.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="495.5" x2="536.5" y1="638.1563" y2="638.1563"/>
       <polygon fill="#A80036" points="505.5,634.1563,495.5,638.1563,505.5,642.1563,501.5,638.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="501.5" y="620.0903">aa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="499.5" x2="541.5" y1="672.2891" y2="672.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="541.5" x2="541.5" y1="672.2891" y2="685.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="500.5" x2="541.5" y1="685.2891" y2="685.2891"/>
       <polygon fill="#A80036" points="510.5,681.2891,500.5,685.2891,510.5,689.2891,506.5,685.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="506.5" y="667.2231">aaa()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L68" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L68" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="530.5,740.4219,540.5,744.4219,530.5,748.4219,534.5,744.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="277.5" x2="536.5" y1="744.4219" y2="744.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="284.5" y="739.356">b()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="552.5" x2="599.5" y1="768.5547" y2="768.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="599.5" x2="599.5" y1="768.5547" y2="781.5547"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="558.5" x2="599.5" y1="781.5547" y2="781.5547"/>
       <polygon fill="#A80036" points="568.5,777.5547,558.5,781.5547,568.5,785.5547,564.5,781.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="564.5" y="763.4888">bb()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="562.5" x2="604.5" y1="815.6875" y2="815.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="604.5" x2="604.5" y1="815.6875" y2="828.6875"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="563.5" x2="604.5" y1="828.6875" y2="828.6875"/>
@@ -238,29 +238,29 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="272.5" x2="749" y1="872.6875" y2="872.6875"/>
     <polygon fill="#A80036" points="57,882.6875,47,886.6875,57,890.6875,53,886.6875" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="759" y1="886.6875" y2="886.6875"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L87" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L87" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L87" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L87" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1161.5,911.8203,1171.5,915.8203,1161.5,919.8203,1165.5,915.8203" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1167.5" y1="915.8203" y2="915.8203"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="15" x="53" y="910.7544">r()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1537.5,940.9531,1547.5,944.9531,1537.5,948.9531,1541.5,944.9531" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1183.5" x2="1543.5" y1="944.9531" y2="944.9531"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="75" x="1190.5" y="939.8872">operator()()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L85" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L85" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="988.5,970.0859,978.5,974.0859,988.5,978.0859,984.5,974.0859" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="982.5" x2="1548.5" y1="974.0859" y2="974.0859"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="994.5" y="969.02">c()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="977.5" x2="1024.5" y1="998.2188" y2="998.2188"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1024.5" x2="1024.5" y1="998.2188" y2="1011.2188"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="983.5" x2="1024.5" y1="1011.2188" y2="1011.2188"/>
       <polygon fill="#A80036" points="993.5,1007.2188,983.5,1011.2188,993.5,1015.2188,989.5,1011.2188" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="24" x="989.5" y="993.1528">cc()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="987.5" x2="1029.5" y1="1045.3516" y2="1045.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="1029.5" x2="1029.5" y1="1045.3516" y2="1058.3516"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="988.5" x2="1029.5" y1="1058.3516" y2="1058.3516"/>
@@ -269,7 +269,7 @@
     </a>
     <polygon fill="#A80036" points="1189.5,1098.3516,1179.5,1102.3516,1189.5,1106.3516,1185.5,1102.3516" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="1183.5" x2="1553.5" y1="1102.3516" y2="1102.3516"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L93" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20012/t20012.cc#L93" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L93" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20012/t20012.cc#L93" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="1746,1127.4844,1756,1131.4844,1746,1135.4844,1750,1131.4844" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="1752" y1="1131.4844" y2="1131.4844"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="58" x="53" y="1126.4185">add5(int)</text>
diff --git a/docs/test_cases/t20013.md b/docs/test_cases/t20013.md
index 3b282d26..51ae1bd0 100644
--- a/docs/test_cases/t20013.md
+++ b/docs/test_cases/t20013.md
@@ -49,3 +49,182 @@ void tmain(int argc, char **argv)
 ```
 ## Generated UML diagrams
 ![t20013_sequence](./t20013_sequence.svg "Function and method arguments in sequence diagrams test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20013_sequence",
+  "participants": [
+    {
+      "id": "1249768632077843821",
+      "name": "clanguml::t20013::tmain(int,char **)",
+      "source_location": {
+        "file": "../../tests/t20013/t20013.cc",
+        "line": 18
+      },
+      "type": "function"
+    },
+    {
+      "id": "1106407610612951303",
+      "name": "clanguml::t20013::B",
+      "source_location": {
+        "file": "../../tests/t20013/t20013.cc",
+        "line": 10
+      },
+      "type": "class"
+    },
+    {
+      "id": "976623130699225079",
+      "name": "clanguml::t20013::A",
+      "source_location": {
+        "file": "../../tests/t20013/t20013.cc",
+        "line": 4
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1249768632077843821",
+            "activity_name": "clanguml::t20013::tmain(int,char **)",
+            "participant_id": "1249768632077843821",
+            "participant_name": "clanguml::t20013::tmain(int,char **)"
+          },
+          "name": "b(int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20013/t20013.cc",
+            "line": 22
+          },
+          "to": {
+            "activity_id": "2144804108273682993",
+            "activity_name": "clanguml::t20013::B::b(int)",
+            "participant_id": "1106407610612951303",
+            "participant_name": "clanguml::t20013::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2144804108273682993",
+            "activity_name": "clanguml::t20013::B::b(int)",
+            "participant_id": "1106407610612951303",
+            "participant_name": "clanguml::t20013::B"
+          },
+          "name": "a1(int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20013/t20013.cc",
+            "line": 11
+          },
+          "to": {
+            "activity_id": "1034027282942033004",
+            "activity_name": "clanguml::t20013::A::a1(int)",
+            "participant_id": "976623130699225079",
+            "participant_name": "clanguml::t20013::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1249768632077843821",
+            "activity_name": "clanguml::t20013::tmain(int,char **)",
+            "participant_id": "1249768632077843821",
+            "participant_name": "clanguml::t20013::tmain(int,char **)"
+          },
+          "name": "b(double)",
+          "return_type": "double",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20013/t20013.cc",
+            "line": 23
+          },
+          "to": {
+            "activity_id": "640747884486165287",
+            "activity_name": "clanguml::t20013::B::b(double)",
+            "participant_id": "1106407610612951303",
+            "participant_name": "clanguml::t20013::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "640747884486165287",
+            "activity_name": "clanguml::t20013::B::b(double)",
+            "participant_id": "1106407610612951303",
+            "participant_name": "clanguml::t20013::B"
+          },
+          "name": "a2(double)",
+          "return_type": "double",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20013/t20013.cc",
+            "line": 12
+          },
+          "to": {
+            "activity_id": "394053399890813915",
+            "activity_name": "clanguml::t20013::A::a2(double)",
+            "participant_id": "976623130699225079",
+            "participant_name": "clanguml::t20013::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1249768632077843821",
+            "activity_name": "clanguml::t20013::tmain(int,char **)",
+            "participant_id": "1249768632077843821",
+            "participant_name": "clanguml::t20013::tmain(int,char **)"
+          },
+          "name": "b(const char *)",
+          "return_type": "const char *",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20013/t20013.cc",
+            "line": 24
+          },
+          "to": {
+            "activity_id": "1066935874364409142",
+            "activity_name": "clanguml::t20013::B::b(const char *)",
+            "participant_id": "1106407610612951303",
+            "participant_name": "clanguml::t20013::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1066935874364409142",
+            "activity_name": "clanguml::t20013::B::b(const char *)",
+            "participant_id": "1106407610612951303",
+            "participant_name": "clanguml::t20013::B"
+          },
+          "name": "a3(const char *)",
+          "return_type": "const char *",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20013/t20013.cc",
+            "line": 13
+          },
+          "to": {
+            "activity_id": "1841239321495867611",
+            "activity_name": "clanguml::t20013::A::a3(const char *)",
+            "participant_id": "976623130699225079",
+            "participant_name": "clanguml::t20013::A"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1249768632077843821,
+        "location": "clanguml::t20013::tmain(int,char **)"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20013"
+}
+```
diff --git a/docs/test_cases/t20013_sequence.svg b/docs/test_cases/t20013_sequence.svg
index 7fb367d9..3dcc79a9 100644
--- a/docs/test_cases/t20013_sequence.svg
+++ b/docs/test_cases/t20013_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:354px;height:357px;" version="1.1" viewBox="0 0 354 357" width="354px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f11wnxibpfpifx" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fo21fsvlbp1t0" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,47 +9,47 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="75" x2="75" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="200.5" x2="200.5" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="333" x2="333" y1="38.2969" y2="317.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11wnxibpfpifx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L18" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L18" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo21fsvlbp1t0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="22.9951">tmain(int,char **)</text>
-      <rect fill="#FEFECE" filter="url(#f11wnxibpfpifx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#fo21fsvlbp1t0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="131" x="8" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="117" x="15" y="336.0889">tmain(int,char **)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11wnxibpfpifx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo21fsvlbp1t0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f11wnxibpfpifx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#fo21fsvlbp1t0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="186.5" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="193.5" y="336.0889">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f11wnxibpfpifx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fo21fsvlbp1t0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f11wnxibpfpifx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
+      <rect fill="#FEFECE" filter="url(#fo21fsvlbp1t0)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="320" y="316.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="327" y="336.0889">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f11wnxibpfpifx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="250.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="70.5" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="195.5" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fo21fsvlbp1t0)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="328.5" y="271.0938"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,65.4297,193.5,69.4297,183.5,73.4297,187.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="34" x="87.5" y="64.3638">b(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,94.5625,326.5,98.5625,316.5,102.5625,320.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="212.5" y="93.4966">a1(int)</text>
@@ -58,12 +58,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="91.5,122.5625,81.5,126.5625,91.5,130.5625,87.5,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,151.6953,193.5,155.6953,183.5,159.6953,187.5,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="87.5" y="150.6294">b(double)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L12" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L12" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,180.8281,326.5,184.8281,316.5,188.8281,320.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="69" x="212.5" y="179.7622">a2(double)</text>
@@ -72,12 +72,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="210.5" x2="332.5" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="91.5,208.8281,81.5,212.8281,91.5,216.8281,87.5,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="85.5" x2="199.5" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="183.5,237.9609,193.5,241.9609,183.5,245.9609,187.5,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="80.5" x2="189.5" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="96" x="87.5" y="236.895">b(const char *)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20013/t20013.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="316.5,267.0938,326.5,271.0938,316.5,275.0938,320.5,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="205.5" x2="322.5" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="104" x="212.5" y="266.0278">a3(const char *)</text>
diff --git a/docs/test_cases/t20014.md b/docs/test_cases/t20014.md
index 8b66928c..68de8c88 100644
--- a/docs/test_cases/t20014.md
+++ b/docs/test_cases/t20014.md
@@ -84,3 +84,191 @@ namespace t20014 {
 ```
 ## Generated UML diagrams
 ![t20014_sequence](./t20014_sequence.svg "Multiple translation units sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20014_sequence",
+  "participants": [
+    {
+      "id": "512436830818921250",
+      "name": "clanguml::t20014::tmain()",
+      "source_location": {
+        "file": "../../tests/t20014/t20014.cc",
+        "line": 10
+      },
+      "type": "function"
+    },
+    {
+      "id": "1537634076295867978",
+      "name": "clanguml::t20014::B",
+      "source_location": {
+        "file": "../../tests/t20014/include/t20014_b.h",
+        "line": 8
+      },
+      "type": "class"
+    },
+    {
+      "id": "1504706415756333840",
+      "name": "clanguml::t20014::A",
+      "source_location": {
+        "file": "../../tests/t20014/include/t20014_a.h",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "500712304857049435",
+      "name": "clanguml::t20014::C<clanguml::t20014::B,int>",
+      "source_location": {
+        "file": "../../tests/t20014/include/t20014_c.h",
+        "line": 6
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "512436830818921250",
+            "activity_name": "clanguml::t20014::tmain()",
+            "participant_id": "512436830818921250",
+            "participant_name": "clanguml::t20014::tmain()"
+          },
+          "name": "b1(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20014/t20014.cc",
+            "line": 15
+          },
+          "to": {
+            "activity_id": "1251633571711578431",
+            "activity_name": "clanguml::t20014::B::b1(int,int)",
+            "participant_id": "1537634076295867978",
+            "participant_name": "clanguml::t20014::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1251633571711578431",
+            "activity_name": "clanguml::t20014::B::b1(int,int)",
+            "participant_id": "1537634076295867978",
+            "participant_name": "clanguml::t20014::B"
+          },
+          "name": "a1(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20014/t20014_b.cc",
+            "line": 5
+          },
+          "to": {
+            "activity_id": "1753682948110709616",
+            "activity_name": "clanguml::t20014::A::a1(int,int)",
+            "participant_id": "1504706415756333840",
+            "participant_name": "clanguml::t20014::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "512436830818921250",
+            "activity_name": "clanguml::t20014::tmain()",
+            "participant_id": "512436830818921250",
+            "participant_name": "clanguml::t20014::tmain()"
+          },
+          "name": "b2(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20014/t20014.cc",
+            "line": 16
+          },
+          "to": {
+            "activity_id": "767830966714379991",
+            "activity_name": "clanguml::t20014::B::b2(int,int)",
+            "participant_id": "1537634076295867978",
+            "participant_name": "clanguml::t20014::B"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "767830966714379991",
+            "activity_name": "clanguml::t20014::B::b2(int,int)",
+            "participant_id": "1537634076295867978",
+            "participant_name": "clanguml::t20014::B"
+          },
+          "name": "a2(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20014/t20014_b.cc",
+            "line": 7
+          },
+          "to": {
+            "activity_id": "1943487088673912694",
+            "activity_name": "clanguml::t20014::A::a2(int,int)",
+            "participant_id": "1504706415756333840",
+            "participant_name": "clanguml::t20014::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "512436830818921250",
+            "activity_name": "clanguml::t20014::tmain()",
+            "participant_id": "512436830818921250",
+            "participant_name": "clanguml::t20014::tmain()"
+          },
+          "name": "c1(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20014/t20014.cc",
+            "line": 18
+          },
+          "to": {
+            "activity_id": "407559038402563981",
+            "activity_name": "clanguml::t20014::C<clanguml::t20014::B,int>::c1(int,int)",
+            "participant_id": "500712304857049435",
+            "participant_name": "clanguml::t20014::C<clanguml::t20014::B,int>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "407559038402563981",
+            "activity_name": "clanguml::t20014::C<clanguml::t20014::B,int>::c1(int,int)",
+            "participant_id": "500712304857049435",
+            "participant_name": "clanguml::t20014::C<clanguml::t20014::B,int>"
+          },
+          "name": "b1(int,int)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20014/include/t20014_c.h",
+            "line": 7
+          },
+          "to": {
+            "activity_id": "1251633571711578431",
+            "activity_name": "clanguml::t20014::B::b1(int,int)",
+            "participant_id": "1537634076295867978",
+            "participant_name": "clanguml::t20014::B"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 512436830818921250,
+        "location": "clanguml::t20014::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20014"
+}
+```
diff --git a/docs/test_cases/t20014_sequence.svg b/docs/test_cases/t20014_sequence.svg
index 40796222..34639fa5 100644
--- a/docs/test_cases/t20014_sequence.svg
+++ b/docs/test_cases/t20014_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="400px" preserveAspectRatio="none" style="width:336px;height:400px;" version="1.1" viewBox="0 0 336 400" width="336px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fkta4qijtoe4l" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f4ntx5q8c1dga" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,56 +9,56 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="222.5" x2="222.5" y1="38.2969" y2="360.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287.5" x2="287.5" y1="38.2969" y2="360.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkta4qijtoe4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014.cc#L10" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014.cc#L10" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4ntx5q8c1dga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fkta4qijtoe4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f4ntx5q8c1dga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="379.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkta4qijtoe4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/include/t20014_b.h#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/include/t20014_b.h#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4ntx5q8c1dga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fkta4qijtoe4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f4ntx5q8c1dga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="118" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="125" y="379.2217">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkta4qijtoe4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/include/t20014_a.h#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/include/t20014_a.h#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4ntx5q8c1dga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fkta4qijtoe4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f4ntx5q8c1dga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="209.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="216.5" y="379.2217">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fkta4qijtoe4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/include/t20014_c.h#L6" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/include/t20014_c.h#L6" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f4ntx5q8c1dga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="22.9951">C&lt;B,int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fkta4qijtoe4l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
+      <rect fill="#FEFECE" filter="url(#f4ntx5q8c1dga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="79" x="246.5" y="359.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="65" x="253.5" y="379.2217">C&lt;B,int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fkta4qijtoe4l)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="293.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="155.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="218" y="300.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f4ntx5q8c1dga)" height="100.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="283" y="241.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,65.4297,125,69.4297,115,73.4297,119,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="64.3638">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,94.5625,216,98.5625,206,102.5625,210,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="93.4966">a1(int,int)</text>
@@ -67,12 +67,12 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="112.5625" y2="112.5625"/>
     <polygon fill="#A80036" points="57,122.5625,47,126.5625,57,130.5625,53,126.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="126.5625" y2="126.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014.cc#L16" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014.cc#L16" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115,151.6953,125,155.6953,115,159.6953,119,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121" y1="155.6953" y2="155.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="53" y="150.6294">b2(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014_b.cc#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014_b.cc#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,180.8281,216,184.8281,206,188.8281,210,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="179.7622">a2(int,int)</text>
@@ -81,17 +81,17 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="142" x2="222" y1="198.8281" y2="198.8281"/>
     <polygon fill="#A80036" points="57,208.8281,47,212.8281,57,216.8281,53,212.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="131" y1="212.8281" y2="212.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="271,237.9609,281,241.9609,271,245.9609,275,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="277" y1="241.9609" y2="241.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="53" y="236.895">c1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/include/t20014_c.h#L7" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/include/t20014_c.h#L7" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="148,267.0938,138,271.0938,148,275.0938,144,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="142" x2="282" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="154" y="266.0278">b1(int,int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014_b.cc#L5" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20014/t20014_b.cc#L5" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="206,296.2266,216,300.2266,206,304.2266,210,300.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137" x2="212" y1="300.2266" y2="300.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="144" y="295.1606">a1(int,int)</text>
diff --git a/docs/test_cases/t20015.md b/docs/test_cases/t20015.md
index b8f6ebaa..9174ca02 100644
--- a/docs/test_cases/t20015.md
+++ b/docs/test_cases/t20015.md
@@ -65,3 +65,63 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20015_sequence](./t20015_sequence.svg "Class exclusion by namespace in sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20015_sequence",
+  "participants": [
+    {
+      "id": "1011496551872082945",
+      "name": "clanguml::t20015::tmain()",
+      "source_location": {
+        "file": "../../tests/t20015/t20015.cc",
+        "line": 31
+      },
+      "type": "function"
+    },
+    {
+      "id": "1302656676783358645",
+      "name": "clanguml::t20015::B",
+      "source_location": {
+        "file": "../../tests/t20015/t20015.cc",
+        "line": 21
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1011496551872082945",
+            "activity_name": "clanguml::t20015::tmain()",
+            "participant_id": "1011496551872082945",
+            "participant_name": "clanguml::t20015::tmain()"
+          },
+          "name": "setup_a(std::shared_ptr<detail::A> &)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20015/t20015.cc",
+            "line": 37
+          },
+          "to": {
+            "activity_id": "431575772398797060",
+            "activity_name": "clanguml::t20015::B::setup_a(std::shared_ptr<detail::A> &)",
+            "participant_id": "1302656676783358645",
+            "participant_name": "clanguml::t20015::B"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1011496551872082945,
+        "location": "clanguml::t20015::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20015"
+}
+```
diff --git a/docs/test_cases/t20015_sequence.svg b/docs/test_cases/t20015_sequence.svg
index e77a03e3..49953ceb 100644
--- a/docs/test_cases/t20015_sequence.svg
+++ b/docs/test_cases/t20015_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:338px;height:157px;" version="1.1" viewBox="0 0 338 157" width="338px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fyhbk7ya7ithc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1sklru7cke59d" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fyhbk7ya7ithc)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fyhbk7ya7ithc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1sklru7cke59d)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1sklru7cke59d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="317" x2="317" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyhbk7ya7ithc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20015/t20015.cc#L31" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20015/t20015.cc#L31" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sklru7cke59d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fyhbk7ya7ithc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1sklru7cke59d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyhbk7ya7ithc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20015/t20015.cc#L21" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20015/t20015.cc#L21" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1sklru7cke59d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fyhbk7ya7ithc)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1sklru7cke59d)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="303" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="310" y="136.4248">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fyhbk7ya7ithc)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fyhbk7ya7ithc)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1sklru7cke59d)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1sklru7cke59d)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="312" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20015/t20015.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20015/t20015.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="300,65.4297,310,69.4297,300,73.4297,304,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="306" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="53" y="64.3638">setup_a(std::shared_ptr&lt;detail::A&gt; &amp;)</text>
diff --git a/docs/test_cases/t20016.md b/docs/test_cases/t20016.md
index a9dcb528..8358bfc2 100644
--- a/docs/test_cases/t20016.md
+++ b/docs/test_cases/t20016.md
@@ -47,3 +47,138 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20016_sequence](./t20016_sequence.svg "Template method specialization sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20016_sequence",
+  "participants": [
+    {
+      "id": "1912662358651926712",
+      "name": "clanguml::t20016::tmain()",
+      "source_location": {
+        "file": "../../tests/t20016/t20016.cc",
+        "line": 16
+      },
+      "type": "function"
+    },
+    {
+      "id": "1688340912643326666",
+      "name": "clanguml::t20016::B<long>",
+      "source_location": {
+        "file": "../../tests/t20016/t20016.cc",
+        "line": 8
+      },
+      "type": "class"
+    },
+    {
+      "id": "1351242594275053195",
+      "name": "clanguml::t20016::A",
+      "source_location": {
+        "file": "../../tests/t20016/t20016.cc",
+        "line": 3
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1912662358651926712",
+            "activity_name": "clanguml::t20016::tmain()",
+            "participant_id": "1912662358651926712",
+            "participant_name": "clanguml::t20016::tmain()"
+          },
+          "name": "b1(long)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20016/t20016.cc",
+            "line": 20
+          },
+          "to": {
+            "activity_id": "2064264710178722261",
+            "activity_name": "clanguml::t20016::B<long>::b1(long)",
+            "participant_id": "1688340912643326666",
+            "participant_name": "clanguml::t20016::B<long>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2064264710178722261",
+            "activity_name": "clanguml::t20016::B<long>::b1(long)",
+            "participant_id": "1688340912643326666",
+            "participant_name": "clanguml::t20016::B<long>"
+          },
+          "name": "a1(int)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20016/t20016.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "1198371121423942542",
+            "activity_name": "clanguml::t20016::A::a1(int)",
+            "participant_id": "1351242594275053195",
+            "participant_name": "clanguml::t20016::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1912662358651926712",
+            "activity_name": "clanguml::t20016::tmain()",
+            "participant_id": "1912662358651926712",
+            "participant_name": "clanguml::t20016::tmain()"
+          },
+          "name": "b2(long)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20016/t20016.cc",
+            "line": 22
+          },
+          "to": {
+            "activity_id": "203381140188081853",
+            "activity_name": "clanguml::t20016::B<long>::b2(long)",
+            "participant_id": "1688340912643326666",
+            "participant_name": "clanguml::t20016::B<long>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "203381140188081853",
+            "activity_name": "clanguml::t20016::B<long>::b2(long)",
+            "participant_id": "1688340912643326666",
+            "participant_name": "clanguml::t20016::B<long>"
+          },
+          "name": "a2(const long &)",
+          "return_type": "long",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20016/t20016.cc",
+            "line": 11
+          },
+          "to": {
+            "activity_id": "1208784669530380166",
+            "activity_name": "clanguml::t20016::A::a2(const long &)",
+            "participant_id": "1351242594275053195",
+            "participant_name": "clanguml::t20016::A"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1912662358651926712,
+        "location": "clanguml::t20016::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20016"
+}
+```
diff --git a/docs/test_cases/t20016_sequence.svg b/docs/test_cases/t20016_sequence.svg
index a75b3c5a..10e2b0f1 100644
--- a/docs/test_cases/t20016_sequence.svg
+++ b/docs/test_cases/t20016_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="273px" preserveAspectRatio="none" style="width:281px;height:273px;" version="1.1" viewBox="0 0 281 273" width="281px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1762mbl4a1vy2" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1uj2i42zn0gtt" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="125" x2="125" y1="38.2969" y2="232.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="260.5" x2="260.5" y1="38.2969" y2="232.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1762mbl4a1vy2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uj2i42zn0gtt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1762mbl4a1vy2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1uj2i42zn0gtt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="251.8232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1762mbl4a1vy2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uj2i42zn0gtt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="22.9951">B&lt;long&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1762mbl4a1vy2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1uj2i42zn0gtt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="78" x="84" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="64" x="91" y="251.8232">B&lt;long&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1762mbl4a1vy2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1uj2i42zn0gtt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1762mbl4a1vy2)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
+      <rect fill="#FEFECE" filter="url(#f1uj2i42zn0gtt)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="247.5" y="231.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="254.5" y="251.8232">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1762mbl4a1vy2)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="166.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="57.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="120" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1uj2i42zn0gtt)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="256" y="186.8281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,65.4297,118,69.4297,108,73.4297,112,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="64.3638">b1(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,94.5625,254,98.5625,244,102.5625,248,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="42" x="137" y="93.4966">a1(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="108,153.6953,118,157.6953,108,161.6953,112,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="114" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="53" x="53" y="152.6294">b2(long)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L11" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20016/t20016.cc#L11" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="244,182.8281,254,186.8281,244,190.8281,248,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="130" x2="250" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="107" x="137" y="181.7622">a2(const long &amp;)</text>
diff --git a/docs/test_cases/t20017.md b/docs/test_cases/t20017.md
index a023c4ea..45faa15e 100644
--- a/docs/test_cases/t20017.md
+++ b/docs/test_cases/t20017.md
@@ -44,3 +44,160 @@ int tmain() { return b2(a1(a2(a3(1, 2), b1(3, 4)), 5), 6); }
 ```
 ## Generated UML diagrams
 ![t20017_sequence](./t20017_sequence.svg "Test case for combine_free_functions_into_file_participants option")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20017_sequence",
+  "participants": [
+    {
+      "id": "294332401323799021",
+      "name": "t20017.cc",
+      "source_location": {
+        "file": "t20017.cc",
+        "line": 6
+      },
+      "type": "function"
+    },
+    {
+      "id": "1591222867263639510",
+      "name": "include/t20017_a.h",
+      "source_location": {
+        "file": "include/t20017_a.h",
+        "line": 7
+      },
+      "type": "function"
+    },
+    {
+      "id": "1113611539183189365",
+      "name": "include/t20017_b.h",
+      "source_location": {
+        "file": "include/t20017_b.h",
+        "line": 5
+      },
+      "type": "function"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1484746432546296115",
+            "activity_name": "clanguml::t20017::tmain()",
+            "participant_id": "294332401323799021",
+            "participant_name": "t20017.cc"
+          },
+          "name": "a3(int,int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "t20017.cc",
+            "line": 6
+          },
+          "to": {
+            "activity_id": "1681392050252260928",
+            "activity_name": "clanguml::t20017::a3(int,int)",
+            "participant_id": "1591222867263639510",
+            "participant_name": "include/t20017_a.h"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1484746432546296115",
+            "activity_name": "clanguml::t20017::tmain()",
+            "participant_id": "294332401323799021",
+            "participant_name": "t20017.cc"
+          },
+          "name": "b1(int,int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "t20017.cc",
+            "line": 6
+          },
+          "to": {
+            "activity_id": "1714277838806105702",
+            "activity_name": "clanguml::t20017::b1(int,int)",
+            "participant_id": "1113611539183189365",
+            "participant_name": "include/t20017_b.h"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1484746432546296115",
+            "activity_name": "clanguml::t20017::tmain()",
+            "participant_id": "294332401323799021",
+            "participant_name": "t20017.cc"
+          },
+          "name": "a2(int,int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "t20017.cc",
+            "line": 6
+          },
+          "to": {
+            "activity_id": "291553542743365259",
+            "activity_name": "clanguml::t20017::a2(int,int)",
+            "participant_id": "1591222867263639510",
+            "participant_name": "include/t20017_a.h"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1484746432546296115",
+            "activity_name": "clanguml::t20017::tmain()",
+            "participant_id": "294332401323799021",
+            "participant_name": "t20017.cc"
+          },
+          "name": "a1(int,int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "t20017.cc",
+            "line": 6
+          },
+          "to": {
+            "activity_id": "113759676939330212",
+            "activity_name": "clanguml::t20017::a1(int,int)",
+            "participant_id": "1591222867263639510",
+            "participant_name": "include/t20017_a.h"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1484746432546296115",
+            "activity_name": "clanguml::t20017::tmain()",
+            "participant_id": "294332401323799021",
+            "participant_name": "t20017.cc"
+          },
+          "name": "b2<int>(int,int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "t20017.cc",
+            "line": 6
+          },
+          "to": {
+            "activity_id": "775081116464505528",
+            "activity_name": "clanguml::t20017::b2<int>(int,int)",
+            "participant_id": "1113611539183189365",
+            "participant_name": "include/t20017_b.h"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1484746432546296115,
+        "location": "clanguml::t20017::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20017"
+}
+```
diff --git a/docs/test_cases/t20017_sequence.svg b/docs/test_cases/t20017_sequence.svg
index 86e801c7..8f319b13 100644
--- a/docs/test_cases/t20017_sequence.svg
+++ b/docs/test_cases/t20017_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="357px" preserveAspectRatio="none" style="width:448px;height:357px;" version="1.1" viewBox="0 0 448 357" width="448px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4sbx9bm64zh8" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fpq9fcmif661l" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,65 +9,65 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="74" x2="74" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="203" x2="203" y1="38.2969" y2="317.0938"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="317.0938"/>
-    <rect fill="#FEFECE" filter="url(#f4sbx9bm64zh8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fpq9fcmif661l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="22.9951">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f4sbx9bm64zh8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fpq9fcmif661l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="84" x="30" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="37" y="336.0889">t20017.cc</text>
-    <rect fill="#FEFECE" filter="url(#f4sbx9bm64zh8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fpq9fcmif661l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="22.9951">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f4sbx9bm64zh8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fpq9fcmif661l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="147" x="128" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="133" x="135" y="336.0889">include/t20017_a.h</text>
-    <rect fill="#FEFECE" filter="url(#f4sbx9bm64zh8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
+    <rect fill="#FEFECE" filter="url(#fpq9fcmif661l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="3"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="22.9951">include/t20017_b.h</text>
-    <rect fill="#FEFECE" filter="url(#f4sbx9bm64zh8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
+    <rect fill="#FEFECE" filter="url(#fpq9fcmif661l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="148" x="289" y="316.0938"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="134" x="296" y="336.0889">include/t20017_b.h</text>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f4sbx9bm64zh8)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="229.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="69" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="184.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="198.5" y="227.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="141.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fpq9fcmif661l)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="271.0938"/>
     <polygon fill="#A80036" points="57,65.4297,67,69.4297,57,73.4297,61,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0;" x1="3" x2="63" y1="69.4297" y2="69.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="10" y="64.3638">tmain()</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,94.5625,196.5,98.5625,186.5,102.5625,190.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="93.4966">a3(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,108.5625,80,112.5625,90,116.5625,86,112.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="112.5625" y2="112.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,137.6953,358,141.6953,348,145.6953,352,141.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="141.6953" y2="141.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="136.6294">b1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,151.6953,80,155.6953,90,159.6953,86,155.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="364" y1="155.6953" y2="155.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,180.8281,196.5,184.8281,186.5,188.8281,190.5,184.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="184.8281" y2="184.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="179.7622">a2(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,194.8281,80,198.8281,90,202.8281,86,198.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="198.8281" y2="198.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="186.5,223.9609,196.5,227.9609,186.5,231.9609,190.5,227.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="192.5" y1="227.9609" y2="227.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="86" y="222.895">a1(int,int)</text>
     </a>
     <polygon fill="#A80036" points="90,237.9609,80,241.9609,90,245.9609,86,241.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="84" x2="202.5" y1="241.9609" y2="241.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20017/t20017.cc#L6" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,267.0938,358,271.0938,348,275.0938,352,271.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="79" x2="354" y1="271.0938" y2="271.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="86" y="266.0278">b2&lt;int&gt;(int,int)</text>
diff --git a/docs/test_cases/t20018.md b/docs/test_cases/t20018.md
index 4caa67e9..24d01a05 100644
--- a/docs/test_cases/t20018.md
+++ b/docs/test_cases/t20018.md
@@ -49,3 +49,249 @@ void tmain() { Answer<Factorial<5>>::print(); }
 ```
 ## Generated UML diagrams
 ![t20018_sequence](./t20018_sequence.svg "Recursive template sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20018_sequence",
+  "participants": [
+    {
+      "id": "227581758025403815",
+      "name": "clanguml::t20018::tmain()",
+      "source_location": {
+        "file": "../../tests/t20018/t20018.cc",
+        "line": 25
+      },
+      "type": "function"
+    },
+    {
+      "id": "1163521725351533502",
+      "name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>",
+      "source_location": {
+        "file": "../../tests/t20018/t20018.cc",
+        "line": 21
+      },
+      "type": "class"
+    },
+    {
+      "id": "1482779373563849921",
+      "name": "clanguml::t20018::Factorial<5>",
+      "source_location": {
+        "file": "../../tests/t20018/t20018.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "52416404065514823",
+      "name": "clanguml::t20018::Factorial<4>",
+      "source_location": {
+        "file": "../../tests/t20018/t20018.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "1658728078296100018",
+      "name": "clanguml::t20018::Factorial<3>",
+      "source_location": {
+        "file": "../../tests/t20018/t20018.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "969903469166760124",
+      "name": "clanguml::t20018::Factorial<2>",
+      "source_location": {
+        "file": "../../tests/t20018/t20018.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "2032621198190600516",
+      "name": "clanguml::t20018::Factorial<1>",
+      "source_location": {
+        "file": "../../tests/t20018/t20018.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "1581865799666386458",
+      "name": "clanguml::t20018::Factorial<0>",
+      "source_location": {
+        "file": "../../tests/t20018/t20018.cc",
+        "line": 12
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "227581758025403815",
+            "activity_name": "clanguml::t20018::tmain()",
+            "participant_id": "227581758025403815",
+            "participant_name": "clanguml::t20018::tmain()"
+          },
+          "name": "print()",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20018/t20018.cc",
+            "line": 25
+          },
+          "to": {
+            "activity_id": "1185770766239304952",
+            "activity_name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>::print()",
+            "participant_id": "1163521725351533502",
+            "participant_name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1185770766239304952",
+            "activity_name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>::print()",
+            "participant_id": "1163521725351533502",
+            "participant_name": "clanguml::t20018::Answer<clanguml::t20018::Factorial<5>,120>"
+          },
+          "name": "print(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20018/t20018.cc",
+            "line": 22
+          },
+          "to": {
+            "activity_id": "833100888453299461",
+            "activity_name": "clanguml::t20018::Factorial<5>::print(int)",
+            "participant_id": "1482779373563849921",
+            "participant_name": "clanguml::t20018::Factorial<5>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "833100888453299461",
+            "activity_name": "clanguml::t20018::Factorial<5>::print(int)",
+            "participant_id": "1482779373563849921",
+            "participant_name": "clanguml::t20018::Factorial<5>"
+          },
+          "name": "print(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20018/t20018.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "1782586643813991247",
+            "activity_name": "clanguml::t20018::Factorial<4>::print(int)",
+            "participant_id": "52416404065514823",
+            "participant_name": "clanguml::t20018::Factorial<4>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1782586643813991247",
+            "activity_name": "clanguml::t20018::Factorial<4>::print(int)",
+            "participant_id": "52416404065514823",
+            "participant_name": "clanguml::t20018::Factorial<4>"
+          },
+          "name": "print(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20018/t20018.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "1238078028595736678",
+            "activity_name": "clanguml::t20018::Factorial<3>::print(int)",
+            "participant_id": "1658728078296100018",
+            "participant_name": "clanguml::t20018::Factorial<3>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1238078028595736678",
+            "activity_name": "clanguml::t20018::Factorial<3>::print(int)",
+            "participant_id": "1658728078296100018",
+            "participant_name": "clanguml::t20018::Factorial<3>"
+          },
+          "name": "print(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20018/t20018.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "2163270950475476780",
+            "activity_name": "clanguml::t20018::Factorial<2>::print(int)",
+            "participant_id": "969903469166760124",
+            "participant_name": "clanguml::t20018::Factorial<2>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "2163270950475476780",
+            "activity_name": "clanguml::t20018::Factorial<2>::print(int)",
+            "participant_id": "969903469166760124",
+            "participant_name": "clanguml::t20018::Factorial<2>"
+          },
+          "name": "print(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20018/t20018.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "501166016325937670",
+            "activity_name": "clanguml::t20018::Factorial<1>::print(int)",
+            "participant_id": "2032621198190600516",
+            "participant_name": "clanguml::t20018::Factorial<1>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "501166016325937670",
+            "activity_name": "clanguml::t20018::Factorial<1>::print(int)",
+            "participant_id": "2032621198190600516",
+            "participant_name": "clanguml::t20018::Factorial<1>"
+          },
+          "name": "print(int)",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20018/t20018.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "577232827352391544",
+            "activity_name": "clanguml::t20018::Factorial<0>::print(int)",
+            "participant_id": "1581865799666386458",
+            "participant_name": "clanguml::t20018::Factorial<0>"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 227581758025403815,
+        "location": "clanguml::t20018::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20018"
+}
+```
diff --git a/docs/test_cases/t20018_sequence.svg b/docs/test_cases/t20018_sequence.svg
index dcec0e02..e4035be0 100644
--- a/docs/test_cases/t20018_sequence.svg
+++ b/docs/test_cases/t20018_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="332px" preserveAspectRatio="none" style="width:1013px;height:332px;" version="1.1" viewBox="0 0 1013 332" width="1013px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1xgsy1huqf874" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fzcoetrsid1b5" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,14 +9,14 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="191" x2="191" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="362" x2="362" y1="38.2969" y2="292.2266"/>
@@ -25,93 +25,93 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="716" x2="716" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="834" x2="834" y1="38.2969" y2="292.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="952" x2="952" y1="38.2969" y2="292.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L25" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="311.2217">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L21" target="_top" title="Answer" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L21" xlink:show="new" xlink:title="Answer" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="22.9951">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="84" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="91" y="311.2217">Answer&lt;Factorial&lt;5&gt;,120&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="22.9951">Factorial&lt;5&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="308" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="315" y="311.2217">Factorial&lt;5&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="22.9951">Factorial&lt;4&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="426" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="433" y="311.2217">Factorial&lt;4&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="22.9951">Factorial&lt;3&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="544" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="551" y="311.2217">Factorial&lt;3&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="22.9951">Factorial&lt;2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="662" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="669" y="311.2217">Factorial&lt;2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L6" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="22.9951">Factorial&lt;1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="780" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="787" y="311.2217">Factorial&lt;1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L12" target="_top" title="Factorial" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L12" xlink:show="new" xlink:title="Factorial" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="22.9951">Factorial&lt;0&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1xgsy1huqf874)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
+      <rect fill="#FEFECE" filter="url(#fzcoetrsid1b5)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="104" x="898" y="291.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="90" x="905" y="311.2217">Factorial&lt;0&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1xgsy1huqf874)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="225.9297" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="204.7969" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="186" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="175.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="357" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="146.5313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="475" y="127.6953"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="117.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="593" y="156.8281"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="88.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="711" y="185.9609"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="829" y="215.0938"/>
+    <rect fill="#FFFFFF" filter="url(#fzcoetrsid1b5)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="947" y="244.2266"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="174,65.4297,184,69.4297,174,73.4297,178,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="180" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="39" x="53" y="64.3638">print()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="345,94.5625,355,98.5625,345,102.5625,349,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="196" x2="351" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="203" y="93.4966">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="463,123.6953,473,127.6953,463,131.6953,467,127.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="367" x2="469" y1="127.6953" y2="127.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="374" y="122.6294">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="581,152.8281,591,156.8281,581,160.8281,585,156.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="485" x2="587" y1="156.8281" y2="156.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="492" y="151.7622">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="699,181.9609,709,185.9609,699,189.9609,703,185.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="603" x2="705" y1="185.9609" y2="185.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="610" y="180.895">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="817,211.0938,827,215.0938,817,219.0938,821,215.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="721" x2="823" y1="215.0938" y2="215.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="728" y="210.0278">print(int)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20018/t20018.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="935,240.2266,945,244.2266,935,248.2266,939,244.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="839" x2="941" y1="244.2266" y2="244.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" text-decoration="underline" textLength="55" x="846" y="239.1606">print(int)</text>
diff --git a/docs/test_cases/t20019.md b/docs/test_cases/t20019.md
index 8188a2b0..3702f494 100644
--- a/docs/test_cases/t20019.md
+++ b/docs/test_cases/t20019.md
@@ -56,3 +56,200 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20019_sequence](./t20019_sequence.svg "Curiously Recurring Template Pattern sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20019_sequence",
+  "participants": [
+    {
+      "id": "375304196268652861",
+      "name": "clanguml::t20019::tmain()",
+      "source_location": {
+        "file": "../../tests/t20019/t20019.cc",
+        "line": 20
+      },
+      "type": "function"
+    },
+    {
+      "id": "381327373934972004",
+      "name": "clanguml::t20019::Base<clanguml::t20019::D1>",
+      "source_location": {
+        "file": "../../tests/t20019/t20019.cc",
+        "line": 8
+      },
+      "type": "class"
+    },
+    {
+      "id": "1282259011856139592",
+      "name": "clanguml::t20019::D1",
+      "source_location": {
+        "file": "../../tests/t20019/t20019.cc",
+        "line": 12
+      },
+      "type": "class"
+    },
+    {
+      "id": "1659477498076328530",
+      "name": "clanguml::t20019::Base<clanguml::t20019::D2>",
+      "source_location": {
+        "file": "../../tests/t20019/t20019.cc",
+        "line": 8
+      },
+      "type": "class"
+    },
+    {
+      "id": "1307471723138212117",
+      "name": "clanguml::t20019::D2",
+      "source_location": {
+        "file": "../../tests/t20019/t20019.cc",
+        "line": 16
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "375304196268652861",
+            "activity_name": "clanguml::t20019::tmain()",
+            "participant_id": "375304196268652861",
+            "participant_name": "clanguml::t20019::tmain()"
+          },
+          "name": "name()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20019/t20019.cc",
+            "line": 23
+          },
+          "to": {
+            "activity_id": "1038853547136467401",
+            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D1>::name()",
+            "participant_id": "381327373934972004",
+            "participant_name": "clanguml::t20019::Base<clanguml::t20019::D1>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1038853547136467401",
+            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D1>::name()",
+            "participant_id": "381327373934972004",
+            "participant_name": "clanguml::t20019::Base<clanguml::t20019::D1>"
+          },
+          "name": "impl()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20019/t20019.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "603969604599968603",
+            "activity_name": "clanguml::t20019::D1::impl()",
+            "participant_id": "1282259011856139592",
+            "participant_name": "clanguml::t20019::D1"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "375304196268652861",
+            "activity_name": "clanguml::t20019::tmain()",
+            "participant_id": "375304196268652861",
+            "participant_name": "clanguml::t20019::tmain()"
+          },
+          "name": "name()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20019/t20019.cc",
+            "line": 25
+          },
+          "to": {
+            "activity_id": "1918672956676175365",
+            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D2>::name()",
+            "participant_id": "1659477498076328530",
+            "participant_name": "clanguml::t20019::Base<clanguml::t20019::D2>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1918672956676175365",
+            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D2>::name()",
+            "participant_id": "1659477498076328530",
+            "participant_name": "clanguml::t20019::Base<clanguml::t20019::D2>"
+          },
+          "name": "impl()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20019/t20019.cc",
+            "line": 9
+          },
+          "to": {
+            "activity_id": "861400435979772695",
+            "activity_name": "clanguml::t20019::D2::impl()",
+            "participant_id": "1307471723138212117",
+            "participant_name": "clanguml::t20019::D2"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "375304196268652861",
+            "activity_name": "clanguml::t20019::tmain()",
+            "participant_id": "375304196268652861",
+            "participant_name": "clanguml::t20019::tmain()"
+          },
+          "name": "name()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20019/t20019.cc",
+            "line": 28
+          },
+          "to": {
+            "activity_id": "1038853547136467401",
+            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D1>::name()",
+            "participant_id": "381327373934972004",
+            "participant_name": "clanguml::t20019::Base<clanguml::t20019::D1>"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "375304196268652861",
+            "activity_name": "clanguml::t20019::tmain()",
+            "participant_id": "375304196268652861",
+            "participant_name": "clanguml::t20019::tmain()"
+          },
+          "name": "name()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20019/t20019.cc",
+            "line": 30
+          },
+          "to": {
+            "activity_id": "1918672956676175365",
+            "activity_name": "clanguml::t20019::Base<clanguml::t20019::D2>::name()",
+            "participant_id": "1659477498076328530",
+            "participant_name": "clanguml::t20019::Base<clanguml::t20019::D2>"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 375304196268652861,
+        "location": "clanguml::t20019::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20019"
+}
+```
diff --git a/docs/test_cases/t20019_sequence.svg b/docs/test_cases/t20019_sequence.svg
index 34c8e115..c11b1680 100644
--- a/docs/test_cases/t20019_sequence.svg
+++ b/docs/test_cases/t20019_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="451px" preserveAspectRatio="none" style="width:391px;height:451px;" version="1.1" viewBox="0 0 391 451" width="391px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fyskvyi8xih42" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1l7g4jj5qey2l" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,95 +9,95 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132" x2="132" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="210" x2="210" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="287" x2="287" y1="38.2969" y2="411.3594"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="365" x2="365" y1="38.2969" y2="411.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L20" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L20" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="430.3545">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="22.9951">Base&lt;D1&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="84" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="91" y="430.3545">Base&lt;D1&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L12" target="_top" title="D1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L12" xlink:show="new" xlink:title="D1" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="22.9951">D1</text>
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="191" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="198" y="430.3545">D1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L8" target="_top" title="Base" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L8" xlink:show="new" xlink:title="Base" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="22.9951">Base&lt;D2&gt;</text>
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="93" x="239" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="79" x="246" y="430.3545">Base&lt;D2&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L16" target="_top" title="D2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L16" xlink:show="new" xlink:title="D2" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="22.9951">D2</text>
-      <rect fill="#FEFECE" filter="url(#fyskvyi8xih42)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
+      <rect fill="#FEFECE" filter="url(#f1l7g4jj5qey2l)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="34" x="346" y="410.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="20" x="353" y="430.3545">D2</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
-    <rect fill="#FFFFFF" filter="url(#fyskvyi8xih42)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="345.0625" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="127.5" y="245.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="205" y="275.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="157.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="282.5" y="334.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="186.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1l7g4jj5qey2l)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="360" y="363.3594"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L23" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L23" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,65.4297,125.5,69.4297,115.5,73.4297,119.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="64.3638">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,94.5625,203,98.5625,193,102.5625,197,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="93.4966">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,153.6953,280.5,157.6953,270.5,161.6953,274.5,157.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="157.6953" y2="157.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="152.6294">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,182.8281,358,186.8281,348,190.8281,352,186.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="186.8281" y2="186.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="181.7622">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L28" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L28" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="115.5,241.9609,125.5,245.9609,115.5,249.9609,119.5,245.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="121.5" y1="245.9609" y2="245.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="240.895">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="193,271.0938,203,275.0938,193,279.0938,197,275.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="137.5" x2="199" y1="275.0938" y2="275.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="144.5" y="270.0278">impl()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L30" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L30" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="270.5,330.2266,280.5,334.2266,270.5,338.2266,274.5,334.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="276.5" y1="334.2266" y2="334.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="47" x="53" y="329.1606">name()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L9" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20019/t20019.cc#L9" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="348,359.3594,358,363.3594,348,367.3594,352,363.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="292.5" x2="354" y1="363.3594" y2="363.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="37" x="299.5" y="358.2935">impl()</text>
diff --git a/docs/test_cases/t20020.md b/docs/test_cases/t20020.md
index 0e8eed4c..a22d1d0a 100644
--- a/docs/test_cases/t20020.md
+++ b/docs/test_cases/t20020.md
@@ -108,3 +108,402 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20020_sequence](./t20020_sequence.svg "If statement sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20020_sequence",
+  "participants": [
+    {
+      "id": "432124388562400664",
+      "name": "clanguml::t20020::tmain()",
+      "source_location": {
+        "file": "../../tests/t20020/t20020.cc",
+        "line": 39
+      },
+      "type": "function"
+    },
+    {
+      "id": "208941846648931609",
+      "name": "clanguml::t20020::A",
+      "source_location": {
+        "file": "../../tests/t20020/t20020.cc",
+        "line": 6
+      },
+      "type": "class"
+    },
+    {
+      "id": "1562462306909405383",
+      "name": "clanguml::t20020::C",
+      "source_location": {
+        "file": "../../tests/t20020/t20020.cc",
+        "line": 20
+      },
+      "type": "class"
+    },
+    {
+      "id": "1342563483612170412",
+      "name": "clanguml::t20020::B",
+      "source_location": {
+        "file": "../../tests/t20020/t20020.cc",
+        "line": 13
+      },
+      "type": "class"
+    },
+    {
+      "id": "1605914310746811866",
+      "name": "clanguml::t20020::D<int>",
+      "source_location": {
+        "file": "../../tests/t20020/t20020.cc",
+        "line": 34
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "activity_id": "432124388562400664",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "432124388562400664",
+                    "activity_name": "clanguml::t20020::tmain()",
+                    "participant_id": "432124388562400664",
+                    "participant_name": "clanguml::t20020::tmain()"
+                  },
+                  "name": "a1()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20020/t20020.cc",
+                    "line": 49
+                  },
+                  "to": {
+                    "activity_id": "43928675765534701",
+                    "activity_name": "clanguml::t20020::A::a1()",
+                    "participant_id": "208941846648931609",
+                    "participant_name": "clanguml::t20020::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "consequent"
+            },
+            {
+              "messages": [
+                {
+                  "activity_id": "432124388562400664",
+                  "branches": [
+                    {
+                      "messages": [
+                        {
+                          "from": {
+                            "activity_id": "432124388562400664",
+                            "activity_name": "clanguml::t20020::tmain()",
+                            "participant_id": "432124388562400664",
+                            "participant_name": "clanguml::t20020::tmain()"
+                          },
+                          "name": "a2()",
+                          "return_type": "int",
+                          "scope": "condition",
+                          "source_location": {
+                            "file": "../../tests/t20020/t20020.cc",
+                            "line": 52
+                          },
+                          "to": {
+                            "activity_id": "1289745252290688140",
+                            "activity_name": "clanguml::t20020::A::a2()",
+                            "participant_id": "208941846648931609",
+                            "participant_name": "clanguml::t20020::A"
+                          },
+                          "type": "message"
+                        },
+                        {
+                          "from": {
+                            "activity_id": "432124388562400664",
+                            "activity_name": "clanguml::t20020::tmain()",
+                            "participant_id": "432124388562400664",
+                            "participant_name": "clanguml::t20020::tmain()"
+                          },
+                          "name": "c3(int)",
+                          "return_type": "int",
+                          "scope": "condition",
+                          "source_location": {
+                            "file": "../../tests/t20020/t20020.cc",
+                            "line": 52
+                          },
+                          "to": {
+                            "activity_id": "1303438784842196201",
+                            "activity_name": "clanguml::t20020::C::c3(int)",
+                            "participant_id": "1562462306909405383",
+                            "participant_name": "clanguml::t20020::C"
+                          },
+                          "type": "message"
+                        },
+                        {
+                          "from": {
+                            "activity_id": "432124388562400664",
+                            "activity_name": "clanguml::t20020::tmain()",
+                            "participant_id": "432124388562400664",
+                            "participant_name": "clanguml::t20020::tmain()"
+                          },
+                          "name": "b1()",
+                          "return_type": "int",
+                          "scope": "normal",
+                          "source_location": {
+                            "file": "../../tests/t20020/t20020.cc",
+                            "line": 53
+                          },
+                          "to": {
+                            "activity_id": "542196582335607343",
+                            "activity_name": "clanguml::t20020::B::b1()",
+                            "participant_id": "1342563483612170412",
+                            "participant_name": "clanguml::t20020::B"
+                          },
+                          "type": "message"
+                        }
+                      ],
+                      "type": "consequent"
+                    },
+                    {
+                      "messages": [
+                        {
+                          "from": {
+                            "activity_id": "432124388562400664",
+                            "activity_name": "clanguml::t20020::tmain()",
+                            "participant_id": "432124388562400664",
+                            "participant_name": "clanguml::t20020::tmain()"
+                          },
+                          "name": "a3()",
+                          "return_type": "int",
+                          "scope": "condition",
+                          "source_location": {
+                            "file": "../../tests/t20020/t20020.cc",
+                            "line": 54
+                          },
+                          "to": {
+                            "activity_id": "1983660679554669898",
+                            "activity_name": "clanguml::t20020::A::a3()",
+                            "participant_id": "208941846648931609",
+                            "participant_name": "clanguml::t20020::A"
+                          },
+                          "type": "message"
+                        },
+                        {
+                          "from": {
+                            "activity_id": "432124388562400664",
+                            "activity_name": "clanguml::t20020::tmain()",
+                            "participant_id": "432124388562400664",
+                            "participant_name": "clanguml::t20020::tmain()"
+                          },
+                          "name": "b2()",
+                          "return_type": "int",
+                          "scope": "normal",
+                          "source_location": {
+                            "file": "../../tests/t20020/t20020.cc",
+                            "line": 55
+                          },
+                          "to": {
+                            "activity_id": "505760236964179187",
+                            "activity_name": "clanguml::t20020::B::b2()",
+                            "participant_id": "1342563483612170412",
+                            "participant_name": "clanguml::t20020::B"
+                          },
+                          "type": "message"
+                        }
+                      ],
+                      "type": "alternative"
+                    }
+                  ],
+                  "name": "if",
+                  "type": "alt"
+                },
+                {
+                  "from": {
+                    "activity_id": "432124388562400664",
+                    "activity_name": "clanguml::t20020::tmain()",
+                    "participant_id": "432124388562400664",
+                    "participant_name": "clanguml::t20020::tmain()"
+                  },
+                  "name": "a4()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20020/t20020.cc",
+                    "line": 60
+                  },
+                  "to": {
+                    "activity_id": "20573198999978866",
+                    "activity_name": "clanguml::t20020::A::a4()",
+                    "participant_id": "208941846648931609",
+                    "participant_name": "clanguml::t20020::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "alternative"
+            }
+          ],
+          "name": "if",
+          "type": "alt"
+        },
+        {
+          "from": {
+            "activity_id": "432124388562400664",
+            "activity_name": "clanguml::t20020::tmain()",
+            "participant_id": "432124388562400664",
+            "participant_name": "clanguml::t20020::tmain()"
+          },
+          "name": "log()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20020/t20020.cc",
+            "line": 63
+          },
+          "to": {
+            "activity_id": "1436250788704205026",
+            "activity_name": "clanguml::t20020::B::log()",
+            "participant_id": "1342563483612170412",
+            "participant_name": "clanguml::t20020::B"
+          },
+          "type": "message"
+        },
+        {
+          "activity_id": "432124388562400664",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "432124388562400664",
+                    "activity_name": "clanguml::t20020::tmain()",
+                    "participant_id": "432124388562400664",
+                    "participant_name": "clanguml::t20020::tmain()"
+                  },
+                  "name": "c1()",
+                  "return_type": "void",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20020/t20020.cc",
+                    "line": 66
+                  },
+                  "to": {
+                    "activity_id": "1962953889020699702",
+                    "activity_name": "clanguml::t20020::C::c1()",
+                    "participant_id": "1562462306909405383",
+                    "participant_name": "clanguml::t20020::C"
+                  },
+                  "type": "message"
+                },
+                {
+                  "activity_id": "1962953889020699702",
+                  "branches": [
+                    {
+                      "messages": [
+                        {
+                          "from": {
+                            "activity_id": "1962953889020699702",
+                            "activity_name": "clanguml::t20020::C::c1()",
+                            "participant_id": "1562462306909405383",
+                            "participant_name": "clanguml::t20020::C"
+                          },
+                          "name": "c2()",
+                          "return_type": "_Bool",
+                          "scope": "condition",
+                          "source_location": {
+                            "file": "../../tests/t20020/t20020.cc",
+                            "line": 25
+                          },
+                          "to": {
+                            "activity_id": "1224151733617799047",
+                            "activity_name": "clanguml::t20020::C::c2()",
+                            "participant_id": "1562462306909405383",
+                            "participant_name": "clanguml::t20020::C"
+                          },
+                          "type": "message"
+                        },
+                        {
+                          "from": {
+                            "activity_id": "1962953889020699702",
+                            "activity_name": "clanguml::t20020::C::c1()",
+                            "participant_id": "1562462306909405383",
+                            "participant_name": "clanguml::t20020::C"
+                          },
+                          "name": "log()",
+                          "return_type": "void",
+                          "scope": "normal",
+                          "source_location": {
+                            "file": "../../tests/t20020/t20020.cc",
+                            "line": 26
+                          },
+                          "to": {
+                            "activity_id": "1108114094862697094",
+                            "activity_name": "clanguml::t20020::C::log()",
+                            "participant_id": "1562462306909405383",
+                            "participant_name": "clanguml::t20020::C"
+                          },
+                          "type": "message"
+                        }
+                      ],
+                      "type": "consequent"
+                    }
+                  ],
+                  "name": "if",
+                  "type": "alt"
+                }
+              ],
+              "type": "consequent"
+            }
+          ],
+          "name": "if",
+          "type": "alt"
+        },
+        {
+          "activity_id": "432124388562400664",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "432124388562400664",
+                    "activity_name": "clanguml::t20020::tmain()",
+                    "participant_id": "432124388562400664",
+                    "participant_name": "clanguml::t20020::tmain()"
+                  },
+                  "name": "d1(int,int)",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20020/t20020.cc",
+                    "line": 69
+                  },
+                  "to": {
+                    "activity_id": "1780002010052842766",
+                    "activity_name": "clanguml::t20020::D<int>::d1(int,int)",
+                    "participant_id": "1605914310746811866",
+                    "participant_name": "clanguml::t20020::D<int>"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "consequent"
+            }
+          ],
+          "name": "if",
+          "type": "alt"
+        }
+      ],
+      "start_from": {
+        "id": 432124388562400664,
+        "location": "clanguml::t20020::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20020"
+}
+```
diff --git a/docs/test_cases/t20020_sequence.svg b/docs/test_cases/t20020_sequence.svg
index 0d520991..589448fb 100644
--- a/docs/test_cases/t20020_sequence.svg
+++ b/docs/test_cases/t20020_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="832px" preserveAspectRatio="none" style="width:346px;height:832px;" version="1.1" viewBox="0 0 346 832" width="346px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f194htljxlig3o" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1cwtq2lk5ofst" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,78 +9,78 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="293.9297" style="stroke: none; stroke-width: 1.0;" width="252.5" x="13" y="115.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
     <rect fill="#FFFFFF" height="88.2656" style="stroke: none; stroke-width: 1.0;" width="232.5" x="23" y="271.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="132.5" x2="132.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="170.5" x2="170.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="231.5" x2="231.5" y1="38.2969" y2="792.5547"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="290.5" x2="290.5" y1="38.2969" y2="792.5547"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L39" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L39" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="811.5498">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="119.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="126.5" y="811.5498">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L20" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L20" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="156.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="163.5" y="811.5498">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L13" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L13" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="224.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="217.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="224.5" y="811.5498">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L34" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L34" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L34" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L34" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="262.5" y="22.9951">D&lt;int&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f194htljxlig3o)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="791.5547"/>
+      <rect fill="#FEFECE" filter="url(#f1cwtq2lk5ofst)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="66" x="255.5" y="791.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="52" x="262.5" y="811.5498">D&lt;int&gt;</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
-    <rect fill="#FFFFFF" filter="url(#f194htljxlig3o)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="734.2578" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="162.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="294.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="128" y="387.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="205.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="180.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165.5" y="520.8906"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="582.1563"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170.5" y="651.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="249.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="337.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="226.5" y="437.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1cwtq2lk5ofst)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="285.5" y="753.5547"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="354.1953" style="stroke: #000000; stroke-width: 2.0;" width="252.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L49" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L49" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,89.5625,126,93.5625,116,97.5625,120,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="88.4966">a1()</text>
@@ -91,7 +91,7 @@
     <path d="M23,124.5625 L87,124.5625 L87,131.5625 L77,141.5625 L23,141.5625 L23,124.5625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="234.7969" style="stroke: #000000; stroke-width: 2.0;" width="232.5" x="23" y="124.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="137.6294">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,158.8281,126,162.8281,116,166.8281,120,162.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="162.8281" y2="162.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="157.7622">[</text>
@@ -100,7 +100,7 @@
     </a>
     <polygon fill="#A80036" points="82,172.8281,72,176.8281,82,180.8281,78,176.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="176.8281" y2="176.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L52" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L52" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,201.9609,163.5,205.9609,153.5,209.9609,157.5,205.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="205.9609" y2="205.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="200.895">[</text>
@@ -109,7 +109,7 @@
     </a>
     <polygon fill="#A80036" points="82,215.9609,72,219.9609,82,223.9609,78,219.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="169.5" y1="219.9609" y2="219.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L53" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L53" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,245.0938,224.5,249.0938,214.5,253.0938,218.5,249.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="249.0938" y2="249.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="244.0278">b1()</text>
@@ -117,7 +117,7 @@
     <polygon fill="#A80036" points="82,259.0938,72,263.0938,82,267.0938,78,263.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="230.5" y1="263.0938" y2="263.0938"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="23" x2="255.5" y1="272.0938" y2="272.0938"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,290.2266,126,294.2266,116,298.2266,120,294.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="294.2266" y2="294.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="289.1606">[</text>
@@ -126,21 +126,21 @@
     </a>
     <polygon fill="#A80036" points="82,304.2266,72,308.2266,82,312.2266,78,308.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="308.2266" y2="308.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L55" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L55" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,333.3594,224.5,337.3594,214.5,341.3594,218.5,337.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="337.3594" y2="337.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="332.2935">b2()</text>
     </a>
     <polygon fill="#A80036" points="82,347.3594,72,351.3594,82,355.3594,78,351.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="230.5" y1="351.3594" y2="351.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="116,383.4922,126,387.4922,116,391.4922,120,387.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="122" y1="387.4922" y2="387.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="78" y="382.4263">a4()</text>
     </a>
     <polygon fill="#A80036" points="82,397.4922,72,401.4922,82,405.4922,78,401.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="76" x2="132" y1="401.4922" y2="401.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L63" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L63" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="214.5,433.625,224.5,437.625,214.5,441.625,218.5,437.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="220.5" y1="437.625" y2="437.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="29" x="78" y="432.5591">log()</text>
@@ -148,7 +148,7 @@
     <path d="M23,482.625 L87,482.625 L87,489.625 L77,499.625 L23,499.625 L23,482.625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="218.6641" style="stroke: #000000; stroke-width: 2.0;" width="223.5" x="23" y="482.625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="495.6919">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L66" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L66" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153.5,516.8906,163.5,520.8906,153.5,524.8906,157.5,520.8906" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="159.5" y1="520.8906" y2="520.8906"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="78" y="515.8247">c1()</text>
@@ -156,7 +156,7 @@
     <path d="M146.5,535.8906 L210.5,535.8906 L210.5,542.8906 L200.5,552.8906 L146.5,552.8906 L146.5,535.8906 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="158.3984" style="stroke: #000000; stroke-width: 2.0;" width="90" x="146.5" y="535.8906"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="161.5" y="548.9575">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L25" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L25" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175.5" x2="222.5" y1="569.1563" y2="569.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="569.1563" y2="582.1563"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="582.1563" y2="582.1563"/>
@@ -169,7 +169,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="222.5" x2="222.5" y1="606.1563" y2="619.1563"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="175.5" x2="222.5" y1="619.1563" y2="619.1563"/>
     <polygon fill="#A80036" points="185.5,615.1563,175.5,619.1563,185.5,623.1563,181.5,619.1563" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="180.5" x2="222.5" y1="643.2891" y2="643.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222.5" x2="222.5" y1="643.2891" y2="656.2891"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181.5" x2="222.5" y1="656.2891" y2="656.2891"/>
@@ -179,7 +179,7 @@
     <path d="M23,715.2891 L87,715.2891 L87,722.2891 L77,732.2891 L23,732.2891 L23,715.2891 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="312.5" x="23" y="715.2891"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="728.356">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20020/t20020.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L69" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20020/t20020.cc#L69" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="273.5,749.5547,283.5,753.5547,273.5,757.5547,277.5,753.5547" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="279.5" y1="753.5547" y2="753.5547"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="62" x="78" y="748.4888">d1(int,int)</text>
diff --git a/docs/test_cases/t20021.md b/docs/test_cases/t20021.md
index a1080295..5fcf502e 100644
--- a/docs/test_cases/t20021.md
+++ b/docs/test_cases/t20021.md
@@ -79,3 +79,336 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20021_sequence](./t20021_sequence.svg "Loop statements sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20021_sequence",
+  "participants": [
+    {
+      "id": "1682631020380557915",
+      "name": "clanguml::t20021::tmain()",
+      "source_location": {
+        "file": "../../tests/t20021/t20021.cc",
+        "line": 30
+      },
+      "type": "function"
+    },
+    {
+      "id": "451128000259357438",
+      "name": "clanguml::t20021::C",
+      "source_location": {
+        "file": "../../tests/t20021/t20021.cc",
+        "line": 18
+      },
+      "type": "class"
+    },
+    {
+      "id": "1280483607329510730",
+      "name": "clanguml::t20021::A",
+      "source_location": {
+        "file": "../../tests/t20021/t20021.cc",
+        "line": 5
+      },
+      "type": "class"
+    },
+    {
+      "id": "1849696080443395393",
+      "name": "clanguml::t20021::B",
+      "source_location": {
+        "file": "../../tests/t20021/t20021.cc",
+        "line": 11
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "activity_id": "1682631020380557915",
+          "messages": [
+            {
+              "from": {
+                "activity_id": "1682631020380557915",
+                "activity_name": "clanguml::t20021::tmain()",
+                "participant_id": "1682631020380557915",
+                "participant_name": "clanguml::t20021::tmain()"
+              },
+              "name": "c4()",
+              "return_type": "int",
+              "scope": "condition",
+              "source_location": {
+                "file": "../../tests/t20021/t20021.cc",
+                "line": 37
+              },
+              "to": {
+                "activity_id": "124927877622321176",
+                "activity_name": "clanguml::t20021::C::c4()",
+                "participant_id": "451128000259357438",
+                "participant_name": "clanguml::t20021::C"
+              },
+              "type": "message"
+            },
+            {
+              "from": {
+                "activity_id": "124927877622321176",
+                "activity_name": "clanguml::t20021::C::c4()",
+                "participant_id": "451128000259357438",
+                "participant_name": "clanguml::t20021::C"
+              },
+              "name": "c5()",
+              "return_type": "int",
+              "scope": "normal",
+              "source_location": {
+                "file": "../../tests/t20021/t20021.cc",
+                "line": 22
+              },
+              "to": {
+                "activity_id": "1325720714179808628",
+                "activity_name": "clanguml::t20021::C::c5()",
+                "participant_id": "451128000259357438",
+                "participant_name": "clanguml::t20021::C"
+              },
+              "type": "message"
+            },
+            {
+              "from": {
+                "activity_id": "1682631020380557915",
+                "activity_name": "clanguml::t20021::tmain()",
+                "participant_id": "1682631020380557915",
+                "participant_name": "clanguml::t20021::tmain()"
+              },
+              "name": "a3()",
+              "return_type": "int",
+              "scope": "normal",
+              "source_location": {
+                "file": "../../tests/t20021/t20021.cc",
+                "line": 38
+              },
+              "to": {
+                "activity_id": "1867955233624891190",
+                "activity_name": "clanguml::t20021::A::a3()",
+                "participant_id": "1280483607329510730",
+                "participant_name": "clanguml::t20021::A"
+              },
+              "type": "message"
+            },
+            {
+              "activity_id": "1682631020380557915",
+              "messages": [
+                {
+                  "activity_id": "1682631020380557915",
+                  "messages": [
+                    {
+                      "from": {
+                        "activity_id": "1682631020380557915",
+                        "activity_name": "clanguml::t20021::tmain()",
+                        "participant_id": "1682631020380557915",
+                        "participant_name": "clanguml::t20021::tmain()"
+                      },
+                      "name": "a2()",
+                      "return_type": "int",
+                      "scope": "condition",
+                      "source_location": {
+                        "file": "../../tests/t20021/t20021.cc",
+                        "line": 40
+                      },
+                      "to": {
+                        "activity_id": "1139294797758415018",
+                        "activity_name": "clanguml::t20021::A::a2()",
+                        "participant_id": "1280483607329510730",
+                        "participant_name": "clanguml::t20021::A"
+                      },
+                      "type": "message"
+                    },
+                    {
+                      "from": {
+                        "activity_id": "1682631020380557915",
+                        "activity_name": "clanguml::t20021::tmain()",
+                        "participant_id": "1682631020380557915",
+                        "participant_name": "clanguml::t20021::tmain()"
+                      },
+                      "name": "c1()",
+                      "return_type": "int",
+                      "scope": "condition",
+                      "source_location": {
+                        "file": "../../tests/t20021/t20021.cc",
+                        "line": 40
+                      },
+                      "to": {
+                        "activity_id": "2143764740072323303",
+                        "activity_name": "clanguml::t20021::C::c1()",
+                        "participant_id": "451128000259357438",
+                        "participant_name": "clanguml::t20021::C"
+                      },
+                      "type": "message"
+                    },
+                    {
+                      "from": {
+                        "activity_id": "1682631020380557915",
+                        "activity_name": "clanguml::t20021::tmain()",
+                        "participant_id": "1682631020380557915",
+                        "participant_name": "clanguml::t20021::tmain()"
+                      },
+                      "name": "c2()",
+                      "return_type": "int",
+                      "scope": "condition",
+                      "source_location": {
+                        "file": "../../tests/t20021/t20021.cc",
+                        "line": 40
+                      },
+                      "to": {
+                        "activity_id": "1707693479408501017",
+                        "activity_name": "clanguml::t20021::C::c2()",
+                        "participant_id": "451128000259357438",
+                        "participant_name": "clanguml::t20021::C"
+                      },
+                      "type": "message"
+                    },
+                    {
+                      "from": {
+                        "activity_id": "1682631020380557915",
+                        "activity_name": "clanguml::t20021::tmain()",
+                        "participant_id": "1682631020380557915",
+                        "participant_name": "clanguml::t20021::tmain()"
+                      },
+                      "name": "a1()",
+                      "return_type": "int",
+                      "scope": "normal",
+                      "source_location": {
+                        "file": "../../tests/t20021/t20021.cc",
+                        "line": 41
+                      },
+                      "to": {
+                        "activity_id": "1659488549696810992",
+                        "activity_name": "clanguml::t20021::A::a1()",
+                        "participant_id": "1280483607329510730",
+                        "participant_name": "clanguml::t20021::A"
+                      },
+                      "type": "message"
+                    }
+                  ],
+                  "name": "for",
+                  "type": "loop"
+                },
+                {
+                  "from": {
+                    "activity_id": "1682631020380557915",
+                    "activity_name": "clanguml::t20021::tmain()",
+                    "participant_id": "1682631020380557915",
+                    "participant_name": "clanguml::t20021::tmain()"
+                  },
+                  "name": "c3()",
+                  "return_type": "int",
+                  "scope": "condition",
+                  "source_location": {
+                    "file": "../../tests/t20021/t20021.cc",
+                    "line": 42
+                  },
+                  "to": {
+                    "activity_id": "1302892753246800390",
+                    "activity_name": "clanguml::t20021::C::c3()",
+                    "participant_id": "451128000259357438",
+                    "participant_name": "clanguml::t20021::C"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "do",
+              "type": "loop"
+            }
+          ],
+          "name": "while",
+          "type": "loop"
+        },
+        {
+          "activity_id": "1682631020380557915",
+          "messages": [
+            {
+              "from": {
+                "activity_id": "1682631020380557915",
+                "activity_name": "clanguml::t20021::tmain()",
+                "participant_id": "1682631020380557915",
+                "participant_name": "clanguml::t20021::tmain()"
+              },
+              "name": "b2()",
+              "return_type": "int",
+              "scope": "normal",
+              "source_location": {
+                "file": "../../tests/t20021/t20021.cc",
+                "line": 47
+              },
+              "to": {
+                "activity_id": "1387752719733375782",
+                "activity_name": "clanguml::t20021::B::b2()",
+                "participant_id": "1849696080443395393",
+                "participant_name": "clanguml::t20021::B"
+              },
+              "type": "message"
+            }
+          ],
+          "name": "for",
+          "type": "loop"
+        },
+        {
+          "activity_id": "1682631020380557915",
+          "messages": [
+            {
+              "from": {
+                "activity_id": "1682631020380557915",
+                "activity_name": "clanguml::t20021::tmain()",
+                "participant_id": "1682631020380557915",
+                "participant_name": "clanguml::t20021::tmain()"
+              },
+              "name": "contents()",
+              "return_type": "std::vector<int> &",
+              "scope": "condition",
+              "source_location": {
+                "file": "../../tests/t20021/t20021.cc",
+                "line": 50
+              },
+              "to": {
+                "activity_id": "814405216385697964",
+                "activity_name": "clanguml::t20021::C::contents()",
+                "participant_id": "451128000259357438",
+                "participant_name": "clanguml::t20021::C"
+              },
+              "type": "message"
+            }
+          ],
+          "name": "for",
+          "type": "loop"
+        },
+        {
+          "from": {
+            "activity_id": "1682631020380557915",
+            "activity_name": "clanguml::t20021::tmain()",
+            "participant_id": "1682631020380557915",
+            "participant_name": "clanguml::t20021::tmain()"
+          },
+          "name": "b2()",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20021/t20021.cc",
+            "line": 54
+          },
+          "to": {
+            "activity_id": "1387752719733375782",
+            "activity_name": "clanguml::t20021::B::b2()",
+            "participant_id": "1849696080443395393",
+            "participant_name": "clanguml::t20021::B"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1682631020380557915,
+        "location": "clanguml::t20021::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20021"
+}
+```
diff --git a/docs/test_cases/t20021_sequence.svg b/docs/test_cases/t20021_sequence.svg
index a26edf43..24e6a231 100644
--- a/docs/test_cases/t20021_sequence.svg
+++ b/docs/test_cases/t20021_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="754px" preserveAspectRatio="none" style="width:315px;height:754px;" version="1.1" viewBox="0 0 315 754" width="315px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f104k2ptp6vx28" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1bbcv8jhmacml" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,74 +9,74 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="263.9297" style="stroke: #000000; stroke-width: 2.0;" width="253.5" x="23" y="234.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="76" x2="76" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="183" x2="183" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="242.5" x2="242.5" y1="38.2969" y2="714.4219"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="280.5" x2="280.5" y1="38.2969" y2="714.4219"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f104k2ptp6vx28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bbcv8jhmacml)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f104k2ptp6vx28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1bbcv8jhmacml)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="43" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="50" y="733.417">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f104k2ptp6vx28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L18" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L18" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bbcv8jhmacml)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="22.9951">C</text>
-      <rect fill="#FEFECE" filter="url(#f104k2ptp6vx28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1bbcv8jhmacml)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="169" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="176" y="733.417">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f104k2ptp6vx28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bbcv8jhmacml)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f104k2ptp6vx28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1bbcv8jhmacml)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="229.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="236.5" y="733.417">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f104k2ptp6vx28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L11" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L11" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1bbcv8jhmacml)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f104k2ptp6vx28)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
+      <rect fill="#FEFECE" filter="url(#f1bbcv8jhmacml)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="266.5" y="713.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="273.5" y="733.417">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
-    <rect fill="#FFFFFF" filter="url(#f104k2ptp6vx28)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="648.125" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="71" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="83.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="183" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="340.3594"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="383.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="476.7578"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="178" y="632.2891"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="205.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="297.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="238" y="426.625"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="558.0234"/>
+    <rect fill="#FFFFFF" filter="url(#f1bbcv8jhmacml)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="275.5" y="682.4219"/>
     <path d="M13,55.2969 L90,55.2969 L90,62.2969 L80,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="450.4609" style="stroke: #000000; stroke-width: 2.0;" width="273.5" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="28" y="68.3638">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,89.5625,176,93.5625,166,97.5625,170,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="88.4966">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="25" x="94" y="88.4966">c4()</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="119" y="88.4966">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L22" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L22" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="188" x2="235" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="235" x2="235" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="194" x2="235" y1="130.6953" y2="130.6953"/>
@@ -89,7 +89,7 @@
     <polygon fill="#A80036" points="198,163.6953,188,167.6953,198,171.6953,194,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="92,172.6953,82,176.6953,92,180.6953,88,176.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="176.6953" y2="176.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,201.8281,236,205.8281,226,209.8281,230,205.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="205.8281" y2="205.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="200.7622">a3()</text>
@@ -102,7 +102,7 @@
     <path d="M33,258.9609 L110,258.9609 L110,265.9609 L100,275.9609 L33,275.9609 L33,258.9609 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="189.6641" style="stroke: #000000; stroke-width: 2.0;" width="233.5" x="33" y="258.9609"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="272.0278">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,293.2266,236,297.2266,226,301.2266,230,297.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="297.2266" y2="297.2266"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="292.1606">[</text>
@@ -111,7 +111,7 @@
     </a>
     <polygon fill="#A80036" points="92,307.2266,82,311.2266,92,315.2266,88,311.2266" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="311.2266" y2="311.2266"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,336.3594,176,340.3594,166,344.3594,170,340.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="340.3594" y2="340.3594"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="335.2935">[</text>
@@ -120,7 +120,7 @@
     </a>
     <polygon fill="#A80036" points="92,350.3594,82,354.3594,92,358.3594,88,354.3594" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="354.3594" y2="354.3594"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,379.4922,176,383.4922,166,387.4922,170,383.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="383.4922" y2="383.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="378.4263">[</text>
@@ -129,14 +129,14 @@
     </a>
     <polygon fill="#A80036" points="92,393.4922,82,397.4922,92,401.4922,88,397.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="397.4922" y2="397.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L41" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L41" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="226,422.625,236,426.625,226,430.625,230,426.625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="232" y1="426.625" y2="426.625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="421.5591">a1()</text>
     </a>
     <polygon fill="#A80036" points="92,436.625,82,440.625,92,444.625,88,440.625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="242" y1="440.625" y2="440.625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L42" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L42" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,472.7578,176,476.7578,166,480.7578,170,476.7578" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="476.7578" y2="476.7578"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="471.6919">[</text>
@@ -148,7 +148,7 @@
     <path d="M33,519.7578 L110,519.7578 L110,526.7578 L100,536.7578 L33,536.7578 L33,519.7578 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="271.5" x="33" y="519.7578"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="532.8247">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L47" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L47" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,554.0234,273.5,558.0234,263.5,562.0234,267.5,558.0234" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="558.0234" y2="558.0234"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="552.9575">b2()</text>
@@ -158,7 +158,7 @@
     <path d="M33,594.0234 L110,594.0234 L110,601.0234 L100,611.0234 L33,611.0234 L33,594.0234 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="174" x="33" y="594.0234"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="48" y="607.0903">loop</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L50" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L50" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="166,628.2891,176,632.2891,166,636.2891,170,632.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="172" y1="632.2891" y2="632.2891"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="88" y="627.2231">[</text>
@@ -167,7 +167,7 @@
     </a>
     <polygon fill="#A80036" points="92,642.2891,82,646.2891,92,650.2891,88,646.2891" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="86" x2="182" y1="646.2891" y2="646.2891"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L54" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20021/t20021.cc#L54" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="263.5,678.4219,273.5,682.4219,263.5,686.4219,267.5,682.4219" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="81" x2="269.5" y1="682.4219" y2="682.4219"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="26" x="88" y="677.356">b2()</text>
diff --git a/docs/test_cases/t20022.md b/docs/test_cases/t20022.md
index 526f2c12..e9e6cc89 100644
--- a/docs/test_cases/t20022.md
+++ b/docs/test_cases/t20022.md
@@ -59,3 +59,94 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20022_sequence](./t20022_sequence.svg "Forward class declaration sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20022_sequence",
+  "participants": [
+    {
+      "id": "1374011101998494743",
+      "name": "clanguml::t20022::tmain()",
+      "source_location": {
+        "file": "../../tests/t20022/t20022.cc",
+        "line": 28
+      },
+      "type": "function"
+    },
+    {
+      "id": "1535467498096081224",
+      "name": "clanguml::t20022::A",
+      "source_location": {
+        "file": "../../tests/t20022/t20022.cc",
+        "line": 7
+      },
+      "type": "class"
+    },
+    {
+      "id": "1316821731069034940",
+      "name": "clanguml::t20022::B",
+      "source_location": {
+        "file": "../../tests/t20022/t20022.cc",
+        "line": 16
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1374011101998494743",
+            "activity_name": "clanguml::t20022::tmain()",
+            "participant_id": "1374011101998494743",
+            "participant_name": "clanguml::t20022::tmain()"
+          },
+          "name": "a()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20022/t20022.cc",
+            "line": 32
+          },
+          "to": {
+            "activity_id": "1158824701633811441",
+            "activity_name": "clanguml::t20022::A::a()",
+            "participant_id": "1535467498096081224",
+            "participant_name": "clanguml::t20022::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1158824701633811441",
+            "activity_name": "clanguml::t20022::A::a()",
+            "participant_id": "1535467498096081224",
+            "participant_name": "clanguml::t20022::A"
+          },
+          "name": "b()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20022/t20022.cc",
+            "line": 26
+          },
+          "to": {
+            "activity_id": "2114222968575993291",
+            "activity_name": "clanguml::t20022::B::b()",
+            "participant_id": "1316821731069034940",
+            "participant_name": "clanguml::t20022::B"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1374011101998494743,
+        "location": "clanguml::t20022::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20022"
+}
+```
diff --git a/docs/test_cases/t20022_sequence.svg b/docs/test_cases/t20022_sequence.svg
index 65d0dfe3..aa3eb6e5 100644
--- a/docs/test_cases/t20022_sequence.svg
+++ b/docs/test_cases/t20022_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="186px" preserveAspectRatio="none" style="width:165px;height:186px;" version="1.1" viewBox="0 0 165 186" width="165px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fgqtfjgnnyett" width="300%" x="-1" y="-1">
+    <filter height="300%" id="flnfchlafzgi8" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,39 +9,39 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fgqtfjgnnyett)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fgqtfjgnnyett)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fgqtfjgnnyett)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
+    <rect fill="#FFFFFF" filter="url(#flnfchlafzgi8)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flnfchlafzgi8)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#flnfchlafzgi8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="146.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="146.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="144.5" x2="144.5" y1="38.2969" y2="146.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgqtfjgnnyett)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L28" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L28" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flnfchlafzgi8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fgqtfjgnnyett)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#flnfchlafzgi8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="165.5576">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgqtfjgnnyett)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flnfchlafzgi8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fgqtfjgnnyett)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#flnfchlafzgi8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="165.5576">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fgqtfjgnnyett)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L16" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L16" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#flnfchlafzgi8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="137.5" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#fgqtfjgnnyett)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="145.5625"/>
+      <rect fill="#FEFECE" filter="url(#flnfchlafzgi8)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="130.5" y="145.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="137.5" y="165.5576">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fgqtfjgnnyett)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fgqtfjgnnyett)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#fgqtfjgnnyett)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#flnfchlafzgi8)" height="80.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#flnfchlafzgi8)" height="59.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#flnfchlafzgi8)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="139.5" y="98.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L32" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L32" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20022/t20022.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="127.5,94.5625,137.5,98.5625,127.5,102.5625,131.5,98.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="133.5" y1="98.5625" y2="98.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="109.5" y="93.4966">b()</text>
diff --git a/docs/test_cases/t20023.md b/docs/test_cases/t20023.md
index e88c8048..4eeb48e2 100644
--- a/docs/test_cases/t20023.md
+++ b/docs/test_cases/t20023.md
@@ -62,3 +62,178 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20023_sequence](./t20023_sequence.svg "Try/catch statement sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20023_sequence",
+  "participants": [
+    {
+      "id": "761552264135157511",
+      "name": "clanguml::t20023::tmain()",
+      "source_location": {
+        "file": "../../tests/t20023/t20023.cc",
+        "line": 29
+      },
+      "type": "function"
+    },
+    {
+      "id": "750638294800359616",
+      "name": "clanguml::t20023::A",
+      "source_location": {
+        "file": "../../tests/t20023/t20023.cc",
+        "line": 6
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "761552264135157511",
+            "activity_name": "clanguml::t20023::tmain()",
+            "participant_id": "761552264135157511",
+            "participant_name": "clanguml::t20023::tmain()"
+          },
+          "name": "a()",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20023/t20023.cc",
+            "line": 35
+          },
+          "to": {
+            "activity_id": "530651320277188697",
+            "activity_name": "clanguml::t20023::A::a()",
+            "participant_id": "750638294800359616",
+            "participant_name": "clanguml::t20023::A"
+          },
+          "type": "message"
+        },
+        {
+          "activity_id": "530651320277188697",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "530651320277188697",
+                    "activity_name": "clanguml::t20023::A::a()",
+                    "participant_id": "750638294800359616",
+                    "participant_name": "clanguml::t20023::A"
+                  },
+                  "name": "a1()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20023/t20023.cc",
+                    "line": 15
+                  },
+                  "to": {
+                    "activity_id": "94135113932519208",
+                    "activity_name": "clanguml::t20023::A::a1()",
+                    "participant_id": "750638294800359616",
+                    "participant_name": "clanguml::t20023::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "main"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "530651320277188697",
+                    "activity_name": "clanguml::t20023::A::a()",
+                    "participant_id": "750638294800359616",
+                    "participant_name": "clanguml::t20023::A"
+                  },
+                  "name": "a2()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20023/t20023.cc",
+                    "line": 18
+                  },
+                  "to": {
+                    "activity_id": "2060438178899014465",
+                    "activity_name": "clanguml::t20023::A::a2()",
+                    "participant_id": "750638294800359616",
+                    "participant_name": "clanguml::t20023::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "catch"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "530651320277188697",
+                    "activity_name": "clanguml::t20023::A::a()",
+                    "participant_id": "750638294800359616",
+                    "participant_name": "clanguml::t20023::A"
+                  },
+                  "name": "a3()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20023/t20023.cc",
+                    "line": 21
+                  },
+                  "to": {
+                    "activity_id": "1776927259621603017",
+                    "activity_name": "clanguml::t20023::A::a3()",
+                    "participant_id": "750638294800359616",
+                    "participant_name": "clanguml::t20023::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "catch"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "530651320277188697",
+                    "activity_name": "clanguml::t20023::A::a()",
+                    "participant_id": "750638294800359616",
+                    "participant_name": "clanguml::t20023::A"
+                  },
+                  "name": "a4()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20023/t20023.cc",
+                    "line": 24
+                  },
+                  "to": {
+                    "activity_id": "1082587698374248813",
+                    "activity_name": "clanguml::t20023::A::a4()",
+                    "participant_id": "750638294800359616",
+                    "participant_name": "clanguml::t20023::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "catch"
+            }
+          ],
+          "name": "try",
+          "type": "break"
+        }
+      ],
+      "start_from": {
+        "id": 761552264135157511,
+        "location": "clanguml::t20023::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20023"
+}
+```
diff --git a/docs/test_cases/t20023_sequence.svg b/docs/test_cases/t20023_sequence.svg
index 5f7368e5..49ff7c9b 100644
--- a/docs/test_cases/t20023_sequence.svg
+++ b/docs/test_cases/t20023_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="493px" preserveAspectRatio="none" style="width:229px;height:493px;" version="1.1" viewBox="0 0 229 493" width="229px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="frngt8t6dw2f6" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1tc4v2t2jmoir" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,37 +9,37 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="170.6953"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="254.6328"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="143" x="74" y="338.5703"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="453.5078"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="453.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frngt8t6dw2f6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L29" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L29" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tc4v2t2jmoir)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#frngt8t6dw2f6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#f1tc4v2t2jmoir)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="472.5029">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#frngt8t6dw2f6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L6" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L6" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1tc4v2t2jmoir)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#frngt8t6dw2f6)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
+      <rect fill="#FEFECE" filter="url(#f1tc4v2t2jmoir)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="452.5078"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="472.5029">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
-    <rect fill="#FFFFFF" filter="url(#frngt8t6dw2f6)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="387.2109" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="366.0781" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="130.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="214.6328"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="298.5703"/>
+    <rect fill="#FFFFFF" filter="url(#f1tc4v2t2jmoir)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="382.5078"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L35" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L35" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
@@ -47,7 +47,7 @@
     <path d="M74,84.4297 L139,84.4297 L139,91.4297 L129,101.4297 L74,101.4297 L74,84.4297 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="338.0781" style="stroke: #000000; stroke-width: 2.0;" width="143" x="74" y="84.4297"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="89" y="97.4966">try</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="117.6953" y2="117.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="117.6953" y2="130.6953"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="130.6953" y2="130.6953"/>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="112.5,163.6953,102.5,167.6953,112.5,171.6953,108.5,167.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="171.6953" y2="171.6953"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="138" x="79" y="181.9058">[std::runtime_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L18" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L18" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="201.6328" y2="201.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="201.6328" y2="214.6328"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="214.6328" y2="214.6328"/>
@@ -73,7 +73,7 @@
     <polygon fill="#A80036" points="112.5,247.6328,102.5,251.6328,112.5,255.6328,108.5,251.6328" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="255.6328" y2="255.6328"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="120" x="79" y="265.8433">[std::logic_error &amp;]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L21" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L21" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="285.5703" y2="285.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="285.5703" y2="298.5703"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="298.5703" y2="298.5703"/>
@@ -86,7 +86,7 @@
     <polygon fill="#A80036" points="112.5,331.5703,102.5,335.5703,112.5,339.5703,108.5,335.5703" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="74" x2="217" y1="339.5703" y2="339.5703"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="79" y="349.7808">[...]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L24" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20023/t20023.cc#L24" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="102.5" x2="149.5" y1="369.5078" y2="369.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="369.5078" y2="382.5078"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="382.5078" y2="382.5078"/>
diff --git a/docs/test_cases/t20024.md b/docs/test_cases/t20024.md
index 5e439a97..60ff1377 100644
--- a/docs/test_cases/t20024.md
+++ b/docs/test_cases/t20024.md
@@ -87,3 +87,332 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20024_sequence](./t20024_sequence.svg "Switch statement sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20024_sequence",
+  "participants": [
+    {
+      "id": "1919714441225983014",
+      "name": "clanguml::t20024::tmain()",
+      "source_location": {
+        "file": "../../tests/t20024/t20024.cc",
+        "line": 53
+      },
+      "type": "function"
+    },
+    {
+      "id": "40786919835708828",
+      "name": "clanguml::t20024::A",
+      "source_location": {
+        "file": "../../tests/t20024/t20024.cc",
+        "line": 8
+      },
+      "type": "class"
+    },
+    {
+      "id": "933287014626440872",
+      "name": "clanguml::t20024::B",
+      "source_location": {
+        "file": "../../tests/t20024/t20024.cc",
+        "line": 29
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1919714441225983014",
+            "activity_name": "clanguml::t20024::tmain()",
+            "participant_id": "1919714441225983014",
+            "participant_name": "clanguml::t20024::tmain()"
+          },
+          "name": "select(enum_a)",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20024/t20024.cc",
+            "line": 58
+          },
+          "to": {
+            "activity_id": "1200587047701031901",
+            "activity_name": "clanguml::t20024::A::select(enum_a)",
+            "participant_id": "40786919835708828",
+            "participant_name": "clanguml::t20024::A"
+          },
+          "type": "message"
+        },
+        {
+          "activity_id": "1200587047701031901",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "1200587047701031901",
+                    "activity_name": "clanguml::t20024::A::select(enum_a)",
+                    "participant_id": "40786919835708828",
+                    "participant_name": "clanguml::t20024::A"
+                  },
+                  "name": "a0()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20024/t20024.cc",
+                    "line": 13
+                  },
+                  "to": {
+                    "activity_id": "1859614580641799156",
+                    "activity_name": "clanguml::t20024::A::a0()",
+                    "participant_id": "40786919835708828",
+                    "participant_name": "clanguml::t20024::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "zero",
+              "type": "case"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "1200587047701031901",
+                    "activity_name": "clanguml::t20024::A::select(enum_a)",
+                    "participant_id": "40786919835708828",
+                    "participant_name": "clanguml::t20024::A"
+                  },
+                  "name": "a1()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20024/t20024.cc",
+                    "line": 15
+                  },
+                  "to": {
+                    "activity_id": "501598940454911460",
+                    "activity_name": "clanguml::t20024::A::a1()",
+                    "participant_id": "40786919835708828",
+                    "participant_name": "clanguml::t20024::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "one",
+              "type": "case"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "1200587047701031901",
+                    "activity_name": "clanguml::t20024::A::select(enum_a)",
+                    "participant_id": "40786919835708828",
+                    "participant_name": "clanguml::t20024::A"
+                  },
+                  "name": "a2()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20024/t20024.cc",
+                    "line": 17
+                  },
+                  "to": {
+                    "activity_id": "1698866541173753340",
+                    "activity_name": "clanguml::t20024::A::a2()",
+                    "participant_id": "40786919835708828",
+                    "participant_name": "clanguml::t20024::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "two",
+              "type": "case"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "1200587047701031901",
+                    "activity_name": "clanguml::t20024::A::select(enum_a)",
+                    "participant_id": "40786919835708828",
+                    "participant_name": "clanguml::t20024::A"
+                  },
+                  "name": "a3()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20024/t20024.cc",
+                    "line": 19
+                  },
+                  "to": {
+                    "activity_id": "490376438551958259",
+                    "activity_name": "clanguml::t20024::A::a3()",
+                    "participant_id": "40786919835708828",
+                    "participant_name": "clanguml::t20024::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "default",
+              "type": "case"
+            }
+          ],
+          "name": "switch",
+          "type": "alt"
+        },
+        {
+          "from": {
+            "activity_id": "1919714441225983014",
+            "activity_name": "clanguml::t20024::tmain()",
+            "participant_id": "1919714441225983014",
+            "participant_name": "clanguml::t20024::tmain()"
+          },
+          "name": "select(colors)",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20024/t20024.cc",
+            "line": 60
+          },
+          "to": {
+            "activity_id": "286108218156977422",
+            "activity_name": "clanguml::t20024::B::select(colors)",
+            "participant_id": "933287014626440872",
+            "participant_name": "clanguml::t20024::B"
+          },
+          "type": "message"
+        },
+        {
+          "activity_id": "286108218156977422",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "286108218156977422",
+                    "activity_name": "clanguml::t20024::B::select(colors)",
+                    "participant_id": "933287014626440872",
+                    "participant_name": "clanguml::t20024::B"
+                  },
+                  "name": "red()",
+                  "return_type": "void",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20024/t20024.cc",
+                    "line": 34
+                  },
+                  "to": {
+                    "activity_id": "112014563206084467",
+                    "activity_name": "clanguml::t20024::B::red()",
+                    "participant_id": "933287014626440872",
+                    "participant_name": "clanguml::t20024::B"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "enum colors::red",
+              "type": "case"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "286108218156977422",
+                    "activity_name": "clanguml::t20024::B::select(colors)",
+                    "participant_id": "933287014626440872",
+                    "participant_name": "clanguml::t20024::B"
+                  },
+                  "name": "orange()",
+                  "return_type": "void",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20024/t20024.cc",
+                    "line": 37
+                  },
+                  "to": {
+                    "activity_id": "2222823236498505185",
+                    "activity_name": "clanguml::t20024::B::orange()",
+                    "participant_id": "933287014626440872",
+                    "participant_name": "clanguml::t20024::B"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "enum colors::orange",
+              "type": "case"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "286108218156977422",
+                    "activity_name": "clanguml::t20024::B::select(colors)",
+                    "participant_id": "933287014626440872",
+                    "participant_name": "clanguml::t20024::B"
+                  },
+                  "name": "green()",
+                  "return_type": "void",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20024/t20024.cc",
+                    "line": 40
+                  },
+                  "to": {
+                    "activity_id": "519021723720658376",
+                    "activity_name": "clanguml::t20024::B::green()",
+                    "participant_id": "933287014626440872",
+                    "participant_name": "clanguml::t20024::B"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "enum colors::green",
+              "type": "case"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "286108218156977422",
+                    "activity_name": "clanguml::t20024::B::select(colors)",
+                    "participant_id": "933287014626440872",
+                    "participant_name": "clanguml::t20024::B"
+                  },
+                  "name": "grey()",
+                  "return_type": "void",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20024/t20024.cc",
+                    "line": 43
+                  },
+                  "to": {
+                    "activity_id": "1813557671878544737",
+                    "activity_name": "clanguml::t20024::B::grey()",
+                    "participant_id": "933287014626440872",
+                    "participant_name": "clanguml::t20024::B"
+                  },
+                  "type": "message"
+                }
+              ],
+              "name": "default",
+              "type": "case"
+            }
+          ],
+          "name": "switch",
+          "type": "alt"
+        }
+      ],
+      "start_from": {
+        "id": 1919714441225983014,
+        "location": "clanguml::t20024::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20024"
+}
+```
diff --git a/docs/test_cases/t20024_sequence.svg b/docs/test_cases/t20024_sequence.svg
index 3cd09910..6b131bba 100644
--- a/docs/test_cases/t20024_sequence.svg
+++ b/docs/test_cases/t20024_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="916px" preserveAspectRatio="none" style="width:364px;height:916px;" version="1.1" viewBox="0 0 364 916" width="364px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1d4l9ql8yfj98" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f17zhpjh03v0sn" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,23 +9,23 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="352.8828" style="stroke: #000000; stroke-width: 2.0;" width="97" x="146.5" y="84.4297"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="101.5625"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="185.5"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="269.4375"/>
     <rect fill="#FFFFFF" height="83.9375" style="stroke: none; stroke-width: 1.0;" width="97" x="146.5" y="353.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="364.8828" style="stroke: #000000; stroke-width: 2.0;" width="146" x="206" y="494.4453"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="511.5781"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="598.5156"/>
     <rect fill="#FFFFFF" height="86.9375" style="stroke: none; stroke-width: 1.0;" width="146" x="206" y="685.4531"/>
@@ -33,36 +33,36 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="169.5" x2="169.5" y1="38.2969" y2="876.3281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="230" x2="230" y1="38.2969" y2="876.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d4l9ql8yfj98)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L53" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L53" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17zhpjh03v0sn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1d4l9ql8yfj98)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f17zhpjh03v0sn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="895.3232">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d4l9ql8yfj98)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L8" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L8" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17zhpjh03v0sn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1d4l9ql8yfj98)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f17zhpjh03v0sn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="156.5" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="163.5" y="895.3232">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1d4l9ql8yfj98)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L29" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L29" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f17zhpjh03v0sn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="22.9951">B</text>
-      <rect fill="#FEFECE" filter="url(#f1d4l9ql8yfj98)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
+      <rect fill="#FEFECE" filter="url(#f17zhpjh03v0sn)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="24" x="216" y="875.3281"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="10" x="223" y="895.3232">B</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
-    <rect fill="#FFFFFF" filter="url(#f1d4l9ql8yfj98)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="818.0313" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="380.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="165" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="145.5"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="229.4375"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="313.375"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="25" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="170" y="397.3125"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="386.8828" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="225" y="479.4453"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="555.5156"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="642.4531"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="729.3906"/>
+    <rect fill="#FFFFFF" filter="url(#f17zhpjh03v0sn)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="230" y="816.3281"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L58" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L58" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="153,65.4297,163,69.4297,153,73.4297,157,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="159" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="100" x="53" y="64.3638">select(enum_a)</text>
@@ -72,7 +72,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="161.5" y="97.4966">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="102.5625" y2="102.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="38" x="151.5" y="112.7729">[zero]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L13" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L13" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="132.5" y2="132.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="132.5" y2="145.5"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="145.5" y2="145.5"/>
@@ -85,7 +85,7 @@
     <polygon fill="#A80036" points="185,178.5,175,182.5,185,186.5,181,182.5" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="186.5" y2="186.5"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="196.7104">[one]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="216.4375" y2="216.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="216.4375" y2="229.4375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="229.4375" y2="229.4375"/>
@@ -98,7 +98,7 @@
     <polygon fill="#A80036" points="185,262.4375,175,266.4375,185,270.4375,181,266.4375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="270.4375" y2="270.4375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="151.5" y="280.6479">[two]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L17" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L17" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="300.375" y2="300.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="300.375" y2="313.375"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="313.375" y2="313.375"/>
@@ -111,7 +111,7 @@
     <polygon fill="#A80036" points="185,346.375,175,350.375,185,354.375,181,350.375" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="146.5" x2="243.5" y1="354.375" y2="354.375"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="151.5" y="364.5854">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="175" x2="222" y1="384.3125" y2="384.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="222" x2="222" y1="384.3125" y2="397.3125"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="181" x2="222" y1="397.3125" y2="397.3125"/>
@@ -124,7 +124,7 @@
     <polygon fill="#A80036" points="185,430.3125,175,434.3125,185,438.3125,181,434.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <polygon fill="#A80036" points="57,446.3125,47,450.3125,57,454.3125,53,450.3125" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="169" y1="450.3125" y2="450.3125"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L60" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L60" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="213,475.4453,223,479.4453,213,483.4453,217,479.4453" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="219" y1="479.4453" y2="479.4453"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="86" x="53" y="474.3794">select(colors)</text>
@@ -134,7 +134,7 @@
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="47" x="221" y="507.5122">switch</text>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="512.5781" y2="512.5781"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="117" x="211" y="522.7886">[enum colors::red]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L34" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L34" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="547.5156" y2="547.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="547.5156" y2="560.5156"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="560.5156" y2="560.5156"/>
@@ -143,7 +143,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="599.5156" y2="599.5156"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="141" x="211" y="609.7261">[enum colors::orange]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L37" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L37" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="634.4531" y2="634.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="634.4531" y2="647.4531"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="647.4531" y2="647.4531"/>
@@ -152,7 +152,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="686.4531" y2="686.4531"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="133" x="211" y="696.6636">[enum colors::green]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L40" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L40" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="721.3906" y2="721.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="721.3906" y2="734.3906"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="734.3906" y2="734.3906"/>
@@ -161,7 +161,7 @@
     </a>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="206" x2="352" y1="773.3906" y2="773.3906"/>
     <text fill="#000000" font-family="sans-serif" font-size="11" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="56" x="211" y="783.6011">[default]</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L43" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20024/t20024.cc#L43" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="240" x2="282" y1="808.3281" y2="808.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="282" x2="282" y1="808.3281" y2="821.3281"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="241" x2="282" y1="821.3281" y2="821.3281"/>
diff --git a/docs/test_cases/t20025.md b/docs/test_cases/t20025.md
index f5e9601a..a72f0615 100644
--- a/docs/test_cases/t20025.md
+++ b/docs/test_cases/t20025.md
@@ -67,3 +67,116 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20025_sequence](./t20025_sequence.svg "Skip decorator sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20025_sequence",
+  "participants": [
+    {
+      "id": "1268545806896171690",
+      "name": "clanguml::t20025::tmain()",
+      "source_location": {
+        "file": "../../tests/t20025/t20025.cc",
+        "line": 30
+      },
+      "type": "function"
+    },
+    {
+      "id": "2144852170258286289",
+      "name": "clanguml::t20025::A",
+      "source_location": {
+        "file": "../../tests/t20025/t20025.cc",
+        "line": 14
+      },
+      "type": "class"
+    },
+    {
+      "id": "228843323046630374",
+      "name": "clanguml::t20025::add(int,int)",
+      "source_location": {
+        "file": "../../tests/t20025/t20025.cc",
+        "line": 4
+      },
+      "type": "function"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1268545806896171690",
+            "activity_name": "clanguml::t20025::tmain()",
+            "participant_id": "1268545806896171690",
+            "participant_name": "clanguml::t20025::tmain()"
+          },
+          "name": "a()",
+          "return_type": "int",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20025/t20025.cc",
+            "line": 36
+          },
+          "to": {
+            "activity_id": "1119830104994271584",
+            "activity_name": "clanguml::t20025::A::a()",
+            "participant_id": "2144852170258286289",
+            "participant_name": "clanguml::t20025::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1119830104994271584",
+            "activity_name": "clanguml::t20025::A::a()",
+            "participant_id": "2144852170258286289",
+            "participant_name": "clanguml::t20025::A"
+          },
+          "name": "a2()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20025/t20025.cc",
+            "line": 19
+          },
+          "to": {
+            "activity_id": "2059622670024664066",
+            "activity_name": "clanguml::t20025::A::a2()",
+            "participant_id": "2144852170258286289",
+            "participant_name": "clanguml::t20025::A"
+          },
+          "type": "message"
+        },
+        {
+          "from": {
+            "activity_id": "1268545806896171690",
+            "activity_name": "clanguml::t20025::tmain()",
+            "participant_id": "1268545806896171690",
+            "participant_name": "clanguml::t20025::tmain()"
+          },
+          "name": "",
+          "return_type": "",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20025/t20025.cc",
+            "line": 38
+          },
+          "to": {
+            "activity_id": "228843323046630374",
+            "activity_name": "clanguml::t20025::add(int,int)",
+            "participant_id": "228843323046630374",
+            "participant_name": "clanguml::t20025::add(int,int)"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1268545806896171690,
+        "location": "clanguml::t20025::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20025"
+}
+```
diff --git a/docs/test_cases/t20025_sequence.svg b/docs/test_cases/t20025_sequence.svg
index 0d6e5f21..cf298ae3 100644
--- a/docs/test_cases/t20025_sequence.svg
+++ b/docs/test_cases/t20025_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="241px" preserveAspectRatio="none" style="width:220px;height:241px;" version="1.1" viewBox="0 0 220 241" width="220px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1fxilaewrcuma" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fcdba73xg1ham" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,41 +9,41 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1fxilaewrcuma)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1fxilaewrcuma)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1fxilaewrcuma)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1fxilaewrcuma)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fcdba73xg1ham)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fcdba73xg1ham)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fcdba73xg1ham)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fcdba73xg1ham)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="201.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="201.5625"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="167" x2="167" y1="38.2969" y2="201.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fxilaewrcuma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L30" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L30" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcdba73xg1ham)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1fxilaewrcuma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#fcdba73xg1ham)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="220.5576">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fxilaewrcuma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L14" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L14" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcdba73xg1ham)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1fxilaewrcuma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#fcdba73xg1ham)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="220.5576">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1fxilaewrcuma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L4" target="_top" title="add" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L4" xlink:show="new" xlink:title="add" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fcdba73xg1ham)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="22.9951">add(int,int)</text>
-      <rect fill="#FEFECE" filter="url(#f1fxilaewrcuma)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="200.5625"/>
+      <rect fill="#FEFECE" filter="url(#fcdba73xg1ham)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="88" x="121" y="200.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="74" x="128" y="220.5576">add(int,int)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1fxilaewrcuma)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1fxilaewrcuma)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1fxilaewrcuma)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1fxilaewrcuma)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fcdba73xg1ham)" height="135.2656" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fcdba73xg1ham)" height="86.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fcdba73xg1ham)" height="28" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="97.5" y="106.5625"/>
+    <rect fill="#FFFFFF" filter="url(#fcdba73xg1ham)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="162" y="169.5625"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L36" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L36" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="107.5" x2="149.5" y1="98.5625" y2="98.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="149.5" x2="149.5" y1="98.5625" y2="111.5625"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="108.5" x2="149.5" y1="111.5625" y2="111.5625"/>
@@ -52,7 +52,7 @@
     </a>
     <polygon fill="#A80036" points="57,151.5625,47,155.5625,57,159.5625,53,155.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="51" x2="96.5" y1="155.5625" y2="155.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L38" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20025/t20025.cc#L38" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="150,165.5625,160,169.5625,150,173.5625,154,169.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="156" y1="169.5625" y2="169.5625"/>
     </a>
diff --git a/docs/test_cases/t20026.md b/docs/test_cases/t20026.md
index 6bba6e41..0c037d13 100644
--- a/docs/test_cases/t20026.md
+++ b/docs/test_cases/t20026.md
@@ -47,3 +47,63 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20026_sequence](./t20026_sequence.svg "Virtual method call sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20026_sequence",
+  "participants": [
+    {
+      "id": "2268697350307997040",
+      "name": "clanguml::t20026::tmain()",
+      "source_location": {
+        "file": "../../tests/t20026/t20026.cc",
+        "line": 16
+      },
+      "type": "function"
+    },
+    {
+      "id": "1962121823853291899",
+      "name": "clanguml::t20026::A",
+      "source_location": {
+        "file": "../../tests/t20026/t20026.cc",
+        "line": 4
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "2268697350307997040",
+            "activity_name": "clanguml::t20026::tmain()",
+            "participant_id": "2268697350307997040",
+            "participant_name": "clanguml::t20026::tmain()"
+          },
+          "name": "a()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20026/t20026.cc",
+            "line": 20
+          },
+          "to": {
+            "activity_id": "600590770418147864",
+            "activity_name": "clanguml::t20026::A::a()",
+            "participant_id": "1962121823853291899",
+            "participant_name": "clanguml::t20026::A"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 2268697350307997040,
+        "location": "clanguml::t20026::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20026"
+}
+```
diff --git a/docs/test_cases/t20026_sequence.svg b/docs/test_cases/t20026_sequence.svg
index d8b230d7..e5081fbe 100644
--- a/docs/test_cases/t20026_sequence.svg
+++ b/docs/test_cases/t20026_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fp1ogjq84zkjh" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fz7typ8do994i" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#fp1ogjq84zkjh)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fp1ogjq84zkjh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#fz7typ8do994i)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fz7typ8do994i)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fp1ogjq84zkjh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20026/t20026.cc#L16" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20026/t20026.cc#L16" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fz7typ8do994i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#fp1ogjq84zkjh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#fz7typ8do994i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#fp1ogjq84zkjh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20026/t20026.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20026/t20026.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#fz7typ8do994i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#fp1ogjq84zkjh)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#fz7typ8do994i)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#fp1ogjq84zkjh)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#fp1ogjq84zkjh)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#fz7typ8do994i)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#fz7typ8do994i)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20026/t20026.cc#L20" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20026/t20026.cc#L20" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20027.md b/docs/test_cases/t20027.md
index d1adac47..345a1ad5 100644
--- a/docs/test_cases/t20027.md
+++ b/docs/test_cases/t20027.md
@@ -46,3 +46,63 @@ void tmain()
 ```
 ## Generated UML diagrams
 ![t20027_sequence](./t20027_sequence.svg "Filter call expressions based on access test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20027_sequence",
+  "participants": [
+    {
+      "id": "1581009482994430286",
+      "name": "clanguml::t20027::tmain()",
+      "source_location": {
+        "file": "../../tests/t20027/t20027.cc",
+        "line": 15
+      },
+      "type": "function"
+    },
+    {
+      "id": "583525629936262089",
+      "name": "clanguml::t20027::A",
+      "source_location": {
+        "file": "../../tests/t20027/t20027.cc",
+        "line": 4
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "1581009482994430286",
+            "activity_name": "clanguml::t20027::tmain()",
+            "participant_id": "1581009482994430286",
+            "participant_name": "clanguml::t20027::tmain()"
+          },
+          "name": "a()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20027/t20027.cc",
+            "line": 19
+          },
+          "to": {
+            "activity_id": "910514967786202717",
+            "activity_name": "clanguml::t20027::A::a()",
+            "participant_id": "583525629936262089",
+            "participant_name": "clanguml::t20027::A"
+          },
+          "type": "message"
+        }
+      ],
+      "start_from": {
+        "id": 1581009482994430286,
+        "location": "clanguml::t20027::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20027"
+}
+```
diff --git a/docs/test_cases/t20027_sequence.svg b/docs/test_cases/t20027_sequence.svg
index 06d3dc7e..f2a3cc34 100644
--- a/docs/test_cases/t20027_sequence.svg
+++ b/docs/test_cases/t20027_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="157px" preserveAspectRatio="none" style="width:118px;height:157px;" version="1.1" viewBox="0 0 118 157" width="118px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1woetiqmr2dpq" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1patpctdugehp" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,25 +9,25 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1woetiqmr2dpq)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1woetiqmr2dpq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f1patpctdugehp)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1patpctdugehp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="41" x2="41" y1="38.2969" y2="117.4297"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="97" x2="97" y1="38.2969" y2="117.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1woetiqmr2dpq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20027/t20027.cc#L15" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20027/t20027.cc#L15" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1patpctdugehp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1woetiqmr2dpq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1patpctdugehp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="8" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="15" y="136.4248">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1woetiqmr2dpq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20027/t20027.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20027/t20027.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1patpctdugehp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1woetiqmr2dpq)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
+      <rect fill="#FEFECE" filter="url(#f1patpctdugehp)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="84" y="116.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="91" y="136.4248">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1woetiqmr2dpq)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1woetiqmr2dpq)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f1patpctdugehp)" height="51.1328" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="36" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1patpctdugehp)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="92.5" y="69.4297"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20027/t20027.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20027/t20027.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="80.5,65.4297,90.5,69.4297,80.5,73.4297,84.5,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="46" x2="86.5" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="53" y="64.3638">a()</text>
diff --git a/docs/test_cases/t20028.md b/docs/test_cases/t20028.md
index b603b9fb..a02f5ae9 100644
--- a/docs/test_cases/t20028.md
+++ b/docs/test_cases/t20028.md
@@ -56,3 +56,146 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20028_sequence](./t20028_sequence.svg "Conditional (ternary) '?:' operator test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20028_sequence",
+  "participants": [
+    {
+      "id": "1347206662193933194",
+      "name": "clanguml::t20028::tmain()",
+      "source_location": {
+        "file": "../../tests/t20028/t20028.cc",
+        "line": 17
+      },
+      "type": "function"
+    },
+    {
+      "id": "2073479923903128898",
+      "name": "clanguml::t20028::A",
+      "source_location": {
+        "file": "../../tests/t20028/t20028.cc",
+        "line": 4
+      },
+      "type": "class"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "activity_id": "1347206662193933194",
+          "branches": [
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "1347206662193933194",
+                    "activity_name": "clanguml::t20028::tmain()",
+                    "participant_id": "1347206662193933194",
+                    "participant_name": "clanguml::t20028::tmain()"
+                  },
+                  "name": "a()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20028/t20028.cc",
+                    "line": 26
+                  },
+                  "to": {
+                    "activity_id": "666210834901940781",
+                    "activity_name": "clanguml::t20028::A::a()",
+                    "participant_id": "2073479923903128898",
+                    "participant_name": "clanguml::t20028::A"
+                  },
+                  "type": "message"
+                },
+                {
+                  "from": {
+                    "activity_id": "1347206662193933194",
+                    "activity_name": "clanguml::t20028::tmain()",
+                    "participant_id": "1347206662193933194",
+                    "participant_name": "clanguml::t20028::tmain()"
+                  },
+                  "name": "b()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20028/t20028.cc",
+                    "line": 26
+                  },
+                  "to": {
+                    "activity_id": "793793464184037795",
+                    "activity_name": "clanguml::t20028::A::b()",
+                    "participant_id": "2073479923903128898",
+                    "participant_name": "clanguml::t20028::A"
+                  },
+                  "type": "message"
+                },
+                {
+                  "from": {
+                    "activity_id": "1347206662193933194",
+                    "activity_name": "clanguml::t20028::tmain()",
+                    "participant_id": "1347206662193933194",
+                    "participant_name": "clanguml::t20028::tmain()"
+                  },
+                  "name": "c()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20028/t20028.cc",
+                    "line": 26
+                  },
+                  "to": {
+                    "activity_id": "1582152567698110078",
+                    "activity_name": "clanguml::t20028::A::c()",
+                    "participant_id": "2073479923903128898",
+                    "participant_name": "clanguml::t20028::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "consequent"
+            },
+            {
+              "messages": [
+                {
+                  "from": {
+                    "activity_id": "1347206662193933194",
+                    "activity_name": "clanguml::t20028::tmain()",
+                    "participant_id": "1347206662193933194",
+                    "participant_name": "clanguml::t20028::tmain()"
+                  },
+                  "name": "d()",
+                  "return_type": "int",
+                  "scope": "normal",
+                  "source_location": {
+                    "file": "../../tests/t20028/t20028.cc",
+                    "line": 26
+                  },
+                  "to": {
+                    "activity_id": "1178268687951492696",
+                    "activity_name": "clanguml::t20028::A::d()",
+                    "participant_id": "2073479923903128898",
+                    "participant_name": "clanguml::t20028::A"
+                  },
+                  "type": "message"
+                }
+              ],
+              "type": "alternative"
+            }
+          ],
+          "name": "conditional",
+          "type": "alt"
+        }
+      ],
+      "start_from": {
+        "id": 1347206662193933194,
+        "location": "clanguml::t20028::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20028"
+}
+```
diff --git a/docs/test_cases/t20028_sequence.svg b/docs/test_cases/t20028_sequence.svg
index d5d0402d..d3f4e627 100644
--- a/docs/test_cases/t20028_sequence.svg
+++ b/docs/test_cases/t20028_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:148px;height:304px;" version="1.1" viewBox="0 0 148 304" width="148px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1wyx8dzi1vy2v" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1088efcofemjx" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,50 +9,50 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
     <rect fill="#FFFFFF" height="45.1328" style="stroke: none; stroke-width: 1.0;" width="123" x="13" y="201.8281"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="56" x2="56" y1="38.2969" y2="263.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="112" x2="112" y1="38.2969" y2="263.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wyx8dzi1vy2v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L17" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L17" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1088efcofemjx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1wyx8dzi1vy2v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1088efcofemjx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="23" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="30" y="282.9561">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1wyx8dzi1vy2v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f1088efcofemjx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="106" y="22.9951">A</text>
-      <rect fill="#FEFECE" filter="url(#f1wyx8dzi1vy2v)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="262.9609"/>
+      <rect fill="#FEFECE" filter="url(#f1088efcofemjx)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="23" x="99" y="262.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="9" x="106" y="282.9561">A</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1wyx8dzi1vy2v)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="205.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="51" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="93.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="136.6953"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="179.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f1088efcofemjx)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="107.5" y="224.9609"/>
     <path d="M13,55.2969 L77,55.2969 L77,62.2969 L67,72.2969 L13,72.2969 L13,55.2969 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="191.6641" style="stroke: #000000; stroke-width: 2.0;" width="123" x="13" y="55.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="28" y="68.3638">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,89.5625,105.5,93.5625,95.5,97.5625,99.5,93.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="93.5625" y2="93.5625"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="88.4966">a()</text>
     </a>
     <polygon fill="#A80036" points="72,103.5625,62,107.5625,72,111.5625,68,107.5625" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="107.5625" y2="107.5625"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,132.6953,105.5,136.6953,95.5,140.6953,99.5,136.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="136.6953" y2="136.6953"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="131.6294">b()</text>
     </a>
     <polygon fill="#A80036" points="72,146.6953,62,150.6953,72,154.6953,68,150.6953" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="150.6953" y2="150.6953"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,175.8281,105.5,179.8281,95.5,183.8281,99.5,179.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="179.8281" y2="179.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="17" x="68" y="174.7622">c()</text>
@@ -60,7 +60,7 @@
     <polygon fill="#A80036" points="72,189.8281,62,193.8281,72,197.8281,68,193.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="66" x2="111.5" y1="193.8281" y2="193.8281"/>
     <line style="stroke: #000000; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="13" x2="136" y1="202.8281" y2="202.8281"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L26" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20028/t20028.cc#L26" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="95.5,220.9609,105.5,224.9609,95.5,228.9609,99.5,224.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="61" x2="101.5" y1="224.9609" y2="224.9609"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="18" x="68" y="219.895">d()</text>
diff --git a/docs/test_cases/t20029.md b/docs/test_cases/t20029.md
index 352f9f77..5dc92331 100644
--- a/docs/test_cases/t20029.md
+++ b/docs/test_cases/t20029.md
@@ -100,3 +100,238 @@ int tmain()
 ```
 ## Generated UML diagrams
 ![t20029_sequence](./t20029_sequence.svg "Combined feature sequence diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "sequence",
+  "name": "t20029_sequence",
+  "participants": [
+    {
+      "id": "2091374738808319642",
+      "name": "clanguml::t20029::tmain()",
+      "source_location": {
+        "file": "../../tests/t20029/t20029.cc",
+        "line": 55
+      },
+      "type": "function"
+    },
+    {
+      "id": "1673261195873192383",
+      "name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>",
+      "source_location": {
+        "file": "../../tests/t20029/t20029.cc",
+        "line": 11
+      },
+      "type": "class"
+    },
+    {
+      "id": "658058855590948094",
+      "name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>",
+      "source_location": {
+        "file": "../../tests/t20029/t20029.cc",
+        "line": 22
+      },
+      "type": "class"
+    },
+    {
+      "id": "1896406205097618937",
+      "name": "clanguml::t20029::ConnectionPool",
+      "source_location": {
+        "file": "../../tests/t20029/t20029.cc",
+        "line": 39
+      },
+      "type": "class"
+    },
+    {
+      "id": "1362646431260879440",
+      "name": "clanguml::t20029::encode_b64(std::string &&)",
+      "source_location": {
+        "file": "../../tests/t20029/t20029.cc",
+        "line": 9
+      },
+      "type": "function"
+    }
+  ],
+  "sequences": [
+    {
+      "messages": [
+        {
+          "from": {
+            "activity_id": "2091374738808319642",
+            "activity_name": "clanguml::t20029::tmain()",
+            "participant_id": "2091374738808319642",
+            "participant_name": "clanguml::t20029::tmain()"
+          },
+          "name": "connect()",
+          "return_type": "void",
+          "scope": "normal",
+          "source_location": {
+            "file": "../../tests/t20029/t20029.cc",
+            "line": 59
+          },
+          "to": {
+            "activity_id": "940428568182104530",
+            "activity_name": "clanguml::t20029::ConnectionPool::connect()",
+            "participant_id": "1896406205097618937",
+            "participant_name": "clanguml::t20029::ConnectionPool"
+          },
+          "type": "message"
+        },
+        {
+          "activity_id": "2091374738808319642",
+          "messages": [
+            {
+              "activity_id": "2091374738808319642",
+              "branches": [
+                {
+                  "messages": [
+                    {
+                      "from": {
+                        "activity_id": "2091374738808319642",
+                        "activity_name": "clanguml::t20029::tmain()",
+                        "participant_id": "2091374738808319642",
+                        "participant_name": "clanguml::t20029::tmain()"
+                      },
+                      "name": "send(std::string &&)",
+                      "return_type": "_Bool",
+                      "scope": "condition",
+                      "source_location": {
+                        "file": "../../tests/t20029/t20029.cc",
+                        "line": 62
+                      },
+                      "to": {
+                        "activity_id": "2026763864005979273",
+                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::send(std::string &&)",
+                        "participant_id": "1673261195873192383",
+                        "participant_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>"
+                      },
+                      "type": "message"
+                    },
+                    {
+                      "from": {
+                        "activity_id": "2026763864005979273",
+                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::send(std::string &&)",
+                        "participant_id": "1673261195873192383",
+                        "participant_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>"
+                      },
+                      "name": "encode(std::string &&)",
+                      "return_type": "std::string",
+                      "scope": "normal",
+                      "source_location": {
+                        "file": "../../tests/t20029/t20029.cc",
+                        "line": 15
+                      },
+                      "to": {
+                        "activity_id": "1468258269466480773",
+                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::encode(std::string &&)",
+                        "participant_id": "1673261195873192383",
+                        "participant_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>"
+                      },
+                      "type": "message"
+                    },
+                    {
+                      "from": {
+                        "activity_id": "1468258269466480773",
+                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::encode(std::string &&)",
+                        "participant_id": "1673261195873192383",
+                        "participant_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>"
+                      },
+                      "name": "",
+                      "return_type": "",
+                      "scope": "normal",
+                      "source_location": {
+                        "file": "../../tests/t20029/t20029.cc",
+                        "line": 19
+                      },
+                      "to": {
+                        "activity_id": "1362646431260879440",
+                        "activity_name": "clanguml::t20029::encode_b64(std::string &&)",
+                        "participant_id": "1362646431260879440",
+                        "participant_name": "clanguml::t20029::encode_b64(std::string &&)"
+                      },
+                      "type": "message"
+                    },
+                    {
+                      "from": {
+                        "activity_id": "2026763864005979273",
+                        "activity_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>::send(std::string &&)",
+                        "participant_id": "1673261195873192383",
+                        "participant_name": "clanguml::t20029::Encoder<clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>>"
+                      },
+                      "name": "send(std::string &&)",
+                      "return_type": "_Bool",
+                      "scope": "normal",
+                      "source_location": {
+                        "file": "../../tests/t20029/t20029.cc",
+                        "line": 15
+                      },
+                      "to": {
+                        "activity_id": "30515971485361302",
+                        "activity_name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>::send(std::string &&)",
+                        "participant_id": "658058855590948094",
+                        "participant_name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>"
+                      },
+                      "type": "message"
+                    },
+                    {
+                      "activity_id": "30515971485361302",
+                      "messages": [
+                        {
+                          "activity_id": "30515971485361302",
+                          "branches": [
+                            {
+                              "messages": [
+                                {
+                                  "from": {
+                                    "activity_id": "30515971485361302",
+                                    "activity_name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>::send(std::string &&)",
+                                    "participant_id": "658058855590948094",
+                                    "participant_name": "clanguml::t20029::Retrier<clanguml::t20029::ConnectionPool>"
+                                  },
+                                  "name": "send(const std::string &)",
+                                  "return_type": "_Bool",
+                                  "scope": "condition",
+                                  "source_location": {
+                                    "file": "../../tests/t20029/t20029.cc",
+                                    "line": 31
+                                  },
+                                  "to": {
+                                    "activity_id": "972625940114169157",
+                                    "activity_name": "clanguml::t20029::ConnectionPool::send(const std::string &)",
+                                    "participant_id": "1896406205097618937",
+                                    "participant_name": "clanguml::t20029::ConnectionPool"
+                                  },
+                                  "type": "message"
+                                }
+                              ],
+                              "type": "consequent"
+                            }
+                          ],
+                          "name": "if",
+                          "type": "alt"
+                        }
+                      ],
+                      "name": "while",
+                      "type": "loop"
+                    }
+                  ],
+                  "type": "consequent"
+                }
+              ],
+              "name": "if",
+              "type": "alt"
+            }
+          ],
+          "name": "for",
+          "type": "loop"
+        }
+      ],
+      "start_from": {
+        "id": 2091374738808319642,
+        "location": "clanguml::t20029::tmain()"
+      }
+    }
+  ],
+  "using_namespace": "clanguml::t20029"
+}
+```
diff --git a/docs/test_cases/t20029_sequence.svg b/docs/test_cases/t20029_sequence.svg
index 3cb2fc4a..428f0973 100644
--- a/docs/test_cases/t20029_sequence.svg
+++ b/docs/test_cases/t20029_sequence.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="508px" preserveAspectRatio="none" style="width:1017px;height:508px;" version="1.1" viewBox="0 0 1017 508" width="1017px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1v8v53i9jycga" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f14fgnnc77sptr" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,60 +9,60 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="337.0625" style="stroke: #000000; stroke-width: 2.0;" width="993" x="13" y="114.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="379" y="318.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="337.0625" style="stroke: #000000; stroke-width: 2.0;" width="993" x="13" y="114.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="91.3984" style="stroke: #000000; stroke-width: 2.0;" width="403" x="379" y="318.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="66" x2="66" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="249" x2="249" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="498" x2="498" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="698" x2="698" y1="38.2969" y2="468.4922"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 5.0,5.0;" x1="879" x2="879" y1="38.2969" y2="468.4922"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L55" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L55" xlink:show="new" xlink:title="tmain" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L55" target="_top" title="tmain" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L55" xlink:show="new" xlink:title="tmain" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="22.9951">tmain()</text>
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="62" x="33" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="48" x="40" y="487.4873">tmain()</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L11" target="_top" title="Encoder" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L11" xlink:show="new" xlink:title="Encoder" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="116" y="22.9951">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="276" x="109" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="262" x="116" y="487.4873">Encoder&lt;Retrier&lt;ConnectionPool&gt;&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L22" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L22" target="_top" title="Retrier" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L22" xlink:show="new" xlink:title="Retrier" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="406" y="22.9951">Retrier&lt;ConnectionPool&gt;</text>
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="194" x="399" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="180" x="406" y="487.4873">Retrier&lt;ConnectionPool&gt;</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L39" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L39" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L39" target="_top" title="ConnectionPool" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L39" xlink:show="new" xlink:title="ConnectionPool" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="641" y="22.9951">ConnectionPool</text>
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="124" x="634" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="110" x="641" y="487.4873">ConnectionPool</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="3"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L9" target="_top" title="encode_b64" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L9" xlink:show="new" xlink:title="encode_b64" xlink:type="simple">
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="3"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="779" y="22.9951">encode_b64(std::string &amp;&amp;)</text>
-      <rect fill="#FEFECE" filter="url(#f1v8v53i9jycga)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="467.4922"/>
+      <rect fill="#FEFECE" filter="url(#f14fgnnc77sptr)" height="30.2969" style="stroke: #A80036; stroke-width: 1.5;" width="210" x="772" y="467.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="196" x="779" y="487.4873">encode_b64(std::string &amp;&amp;)</text>
     </a>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
-    <rect fill="#FFFFFF" filter="url(#f1v8v53i9jycga)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="410.1953" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="61" y="48.2969"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="259.6641" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="244" y="176.8281"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="53" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="249" y="213.9609"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="119.3984" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="493" y="303.0938"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="30" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="69.4297"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="693" y="380.4922"/>
+    <rect fill="#FFFFFF" filter="url(#f14fgnnc77sptr)" height="14" style="stroke: #A80036; stroke-width: 1.0;" width="10" x="874" y="232.9609"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L59" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L59" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="681,65.4297,691,69.4297,681,73.4297,685,69.4297" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="687" y1="69.4297" y2="69.4297"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="61" x="78" y="64.3638">connect()</text>
@@ -73,21 +73,21 @@
     <path d="M23,138.5625 L87,138.5625 L87,145.5625 L77,155.5625 L23,155.5625 L23,138.5625 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="305.9297" style="stroke: #000000; stroke-width: 2.0;" width="973" x="23" y="138.5625"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="38" y="151.6294">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L62" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L62" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="232,172.8281,242,176.8281,232,180.8281,236,176.8281" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="71" x2="238" y1="176.8281" y2="176.8281"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="78" y="171.7622">[</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="84" y="171.7622">send(std::string &amp;&amp;)</text>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="215" y="171.7622">]</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="254" x2="301" y1="200.9609" y2="200.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="301" x2="301" y1="200.9609" y2="213.9609"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="260" x2="301" y1="213.9609" y2="213.9609"/>
       <polygon fill="#A80036" points="270,209.9609,260,213.9609,270,217.9609,266,213.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="147" x="266" y="195.895">encode(std::string &amp;&amp;)</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L19" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L19" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="862,228.9609,872,232.9609,862,236.9609,866,232.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="259" x2="868" y1="232.9609" y2="232.9609"/>
     </a>
@@ -97,7 +97,7 @@
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="301" x2="301" y1="265.9609" y2="278.9609"/>
     <line style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 2.0,2.0;" x1="254" x2="301" y1="278.9609" y2="278.9609"/>
     <polygon fill="#A80036" points="264,274.9609,254,278.9609,264,282.9609,260,278.9609" style="stroke: #A80036; stroke-width: 1.0;"/>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L15" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L15" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="481,299.0938,491,303.0938,481,307.0938,485,303.0938" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="254" x2="487" y1="303.0938" y2="303.0938"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="261" y="298.0278">send(std::string &amp;&amp;)</text>
@@ -108,7 +108,7 @@
     <path d="M389,342.2266 L453,342.2266 L453,349.2266 L443,359.2266 L389,359.2266 L389,342.2266 " fill="#EEEEEE" style="stroke: #000000; stroke-width: 1.0;"/>
     <rect fill="none" height="60.2656" style="stroke: #000000; stroke-width: 2.0;" width="383" x="389" y="342.2266"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="19" x="404" y="355.2935">alt</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t20029/t20029.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L31" target="_top" title="" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t20029/t20029.cc#L31" xlink:show="new" xlink:title="" xlink:type="simple">
       <polygon fill="#A80036" points="681,376.4922,691,380.4922,681,384.4922,685,380.4922" style="stroke: #A80036; stroke-width: 1.0;"/>
       <line style="stroke: #A80036; stroke-width: 1.0;" x1="503" x2="687" y1="380.4922" y2="380.4922"/>
       <text fill="#000000" font-family="sans-serif" font-size="13" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="6" x="510" y="375.4263">[</text>
diff --git a/docs/test_cases/t30001.md b/docs/test_cases/t30001.md
index a81a983f..dc4f0dbe 100644
--- a/docs/test_cases/t30001.md
+++ b/docs/test_cases/t30001.md
@@ -58,3 +58,140 @@ namespace BB {
 ```
 ## Generated UML diagrams
 ![t30001_package](./t30001_package.svg "Basic package diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "clanguml::t30001::A",
+      "elements": [
+        {
+          "comment": {
+            "formatted": "This is namespace AA in namespace A",
+            "raw": "/// This is namespace AA in namespace A"
+          },
+          "display_name": "clanguml::t30001::A::AA",
+          "elements": [
+            {
+              "display_name": "clanguml::t30001::A::AA::AAA",
+              "id": "274638237740249424",
+              "is_deprecated": false,
+              "name": "AAA",
+              "source_location": {
+                "file": "../../tests/t30001/t30001.cc",
+                "line": 6
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30001::A::AA::BBB",
+              "id": "2129154382024012563",
+              "is_deprecated": false,
+              "name": "BBB",
+              "source_location": {
+                "file": "../../tests/t30001/t30001.cc",
+                "line": 8
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "1528517990989164155",
+          "is_deprecated": false,
+          "name": "AA",
+          "source_location": {
+            "file": "../../tests/t30001/t30001.cc",
+            "line": 5
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30001::A::BB",
+          "id": "983199564524723281",
+          "is_deprecated": false,
+          "name": "BB",
+          "source_location": {
+            "file": "../../tests/t30001/t30001.cc",
+            "line": 11
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "1184614645531659789",
+      "is_deprecated": false,
+      "name": "A",
+      "source_location": {
+        "file": "../../tests/t30001/t30001.cc",
+        "line": 3
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30001::B",
+      "elements": [
+        {
+          "comment": {
+            "formatted": "This is namespace AA in namespace B",
+            "raw": "/// This is namespace AA in namespace B"
+          },
+          "display_name": "clanguml::t30001::B::AA",
+          "elements": [
+            {
+              "display_name": "clanguml::t30001::B::AA::AAA",
+              "id": "262162485307734028",
+              "is_deprecated": false,
+              "name": "AAA",
+              "source_location": {
+                "file": "../../tests/t30001/t30001.cc",
+                "line": 17
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30001::B::AA::BBB",
+              "id": "18542334992237803",
+              "is_deprecated": false,
+              "name": "BBB",
+              "source_location": {
+                "file": "../../tests/t30001/t30001.cc",
+                "line": 19
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "895913707182089871",
+          "is_deprecated": false,
+          "name": "AA",
+          "source_location": {
+            "file": "../../tests/t30001/t30001.cc",
+            "line": 16
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30001::B::BB",
+          "id": "2230464321696304488",
+          "is_deprecated": false,
+          "name": "BB",
+          "source_location": {
+            "file": "../../tests/t30001/t30001.cc",
+            "line": 22
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "1931735210112054430",
+      "is_deprecated": false,
+      "name": "B",
+      "source_location": {
+        "file": "../../tests/t30001/t30001.cc",
+        "line": 14
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30001_package",
+  "relationships": [],
+  "using_namespace": "clanguml::t30001"
+}
+```
diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg
index 021a78a6..9ae8b415 100644
--- a/docs/test_cases/t30001_package.svg
+++ b/docs/test_cases/t30001_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="264px" preserveAspectRatio="none" style="width:854px;height:264px;" version="1.1" viewBox="0 0 854 264" width="854px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1jw7qrtxmpfdu" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f3oew98rx342s" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,63 +9,63 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="49,49,66,49,73,71.2969,370,71.2969,370,252,49,252,49,49" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="49,49,66,49,73,71.2969,370,71.2969,370,252,49,252,49,49" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="49" x2="73" y1="71.2969" y2="71.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="53" y="63.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="132,100,160,100,167,122.2969,338,122.2969,338,220,132,220,132,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L5" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L5" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="132,100,160,100,167,122.2969,338,122.2969,338,220,132,220,132,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="132" x2="167" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="136" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="511,49,527,49,534,71.2969,832,71.2969,832,252,511,252,511,49" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L14" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L14" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="511,49,527,49,534,71.2969,832,71.2969,832,252,511,252,511,49" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="511" x2="534" y1="71.2969" y2="71.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="515" y="63.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="594,100,622,100,629,122.2969,800,122.2969,800,220,594,220,594,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L16" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L16" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="594,100,622,100,629,122.2969,800,122.2969,800,220,594,220,594,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="594" x2="629" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="598" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="260.5,143,299.5,143,306.5,165.2969,313.5,165.2969,313.5,195.5938,260.5,195.5938,260.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L6" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L6" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="260.5,143,299.5,143,306.5,165.2969,313.5,165.2969,313.5,195.5938,260.5,195.5938,260.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="260.5" x2="306.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="264.5" y="157.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="175,143,211,143,218,165.2969,225,165.2969,225,195.5938,175,195.5938,175,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="175,143,211,143,218,165.2969,225,165.2969,225,195.5938,175,195.5938,175,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="218" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="179" y="157.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="65,143,91,143,98,165.2969,105,165.2969,105,195.5938,65,195.5938,65,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L11" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L11" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="65,143,91,143,98,165.2969,105,165.2969,105,195.5938,65,195.5938,65,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="98" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="69" y="157.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="722.5,143,761.5,143,768.5,165.2969,775.5,165.2969,775.5,195.5938,722.5,195.5938,722.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L17" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L17" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="722.5,143,761.5,143,768.5,165.2969,775.5,165.2969,775.5,195.5938,722.5,195.5938,722.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="722.5" x2="768.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="726.5" y="157.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="637,143,673,143,680,165.2969,687,165.2969,687,195.5938,637,195.5938,637,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L19" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L19" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="637,143,673,143,680,165.2969,687,165.2969,687,195.5938,637,195.5938,637,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="637" x2="680" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="641" y="157.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1jw7qrtxmpfdu)" points="527,143,553,143,560,165.2969,567,165.2969,567,195.5938,527,195.5938,527,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L22" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30001/t30001.cc#L22" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f3oew98rx342s)" points="527,143,553,143,560,165.2969,567,165.2969,567,195.5938,527,195.5938,527,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="527" x2="560" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="531" y="157.9951">BB</text>
     </a>
-    <path d="M386,157 L386,182.1328 L492,182.1328 L492,167 L482,157 L386,157 " fill="#FBFB77" filter="url(#f1jw7qrtxmpfdu)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M386,157 L386,182.1328 L492,182.1328 L492,167 L482,157 L386,157 " fill="#FBFB77" filter="url(#f3oew98rx342s)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M482,157 L482,167 L492,167 L482,157 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="85" x="392" y="174.0669">A AAA note...</text>
-    <path d="M6,8 L6,33.1328 L274,33.1328 L274,18 L264,8 L6,8 " fill="#FBFB77" filter="url(#f1jw7qrtxmpfdu)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L274,33.1328 L274,18 L264,8 L6,8 " fill="#FBFB77" filter="url(#f3oew98rx342s)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M264,8 L264,18 L274,18 L264,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="12" y="25.0669">This is namespace AA in namespace A</text>
-    <path d="M468,8 L468,33.1328 L736,33.1328 L736,18 L726,8 L468,8 " fill="#FBFB77" filter="url(#f1jw7qrtxmpfdu)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M468,8 L468,33.1328 L736,33.1328 L736,18 L726,8 L468,8 " fill="#FBFB77" filter="url(#f3oew98rx342s)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M726,8 L726,18 L736,18 L726,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="247" x="474" y="25.0669">This is namespace AA in namespace B</text>
     <path d="M313.72,169.5 C337.7,169.5 361.68,169.5 385.66,169.5 " fill="none" id="C_0000274638237740249424-GMN1079" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30002.md b/docs/test_cases/t30002.md
index 27475505..357e11f0 100644
--- a/docs/test_cases/t30002.md
+++ b/docs/test_cases/t30002.md
@@ -138,3 +138,367 @@ template <typename T> std::map<T, std::shared_ptr<A::AA::A13::CM>> cm()
 ```
 ## Generated UML diagrams
 ![t30002_package](./t30002_package.svg "Package dependency test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "clanguml::t30002::A",
+      "elements": [
+        {
+          "display_name": "clanguml::t30002::A::AA",
+          "elements": [
+            {
+              "display_name": "clanguml::t30002::A::AA::A1",
+              "id": "1164966689017271053",
+              "is_deprecated": false,
+              "name": "A1",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 10
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A2",
+              "id": "695366113361481509",
+              "is_deprecated": false,
+              "name": "A2",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 13
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A3",
+              "id": "1267709074800873528",
+              "is_deprecated": false,
+              "name": "A3",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 16
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A4",
+              "id": "299262817531370604",
+              "is_deprecated": false,
+              "name": "A4",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 19
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A5",
+              "id": "1207764290216680521",
+              "is_deprecated": false,
+              "name": "A5",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 22
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A6",
+              "id": "899091126727901939",
+              "is_deprecated": false,
+              "name": "A6",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 25
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A7",
+              "id": "563861734550555261",
+              "is_deprecated": false,
+              "name": "A7",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 28
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A8",
+              "id": "839146342143718390",
+              "is_deprecated": false,
+              "name": "A8",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 31
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A9",
+              "id": "1650835159458422245",
+              "is_deprecated": false,
+              "name": "A9",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 34
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A10",
+              "id": "1453242941322376182",
+              "is_deprecated": false,
+              "name": "A10",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 37
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A11",
+              "id": "384833776371876986",
+              "is_deprecated": false,
+              "name": "A11",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 40
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A12",
+              "id": "1199527037490355138",
+              "is_deprecated": false,
+              "name": "A12",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 43
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A13",
+              "id": "620689743711615190",
+              "is_deprecated": false,
+              "name": "A13",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 46
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A14",
+              "id": "301858476377711436",
+              "is_deprecated": false,
+              "name": "A14",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 49
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A15",
+              "id": "561239706327729436",
+              "is_deprecated": false,
+              "name": "A15",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 52
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A16",
+              "id": "1415398383158410524",
+              "is_deprecated": false,
+              "name": "A16",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 55
+              },
+              "type": "namespace"
+            },
+            {
+              "display_name": "clanguml::t30002::A::AA::A17",
+              "id": "532437874530119999",
+              "is_deprecated": false,
+              "name": "A17",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 58
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "1669745471968085401",
+          "is_deprecated": false,
+          "name": "AA",
+          "source_location": {
+            "file": "../../tests/t30002/t30002.cc",
+            "line": 9
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "1543480715632256641",
+      "is_deprecated": false,
+      "name": "A",
+      "source_location": {
+        "file": "../../tests/t30002/t30002.cc",
+        "line": 9
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30002::B",
+      "elements": [
+        {
+          "display_name": "clanguml::t30002::B::BB",
+          "elements": [
+            {
+              "display_name": "clanguml::t30002::B::BB::BBB",
+              "id": "2255521339657425355",
+              "is_deprecated": false,
+              "name": "BBB",
+              "source_location": {
+                "file": "../../tests/t30002/t30002.cc",
+                "line": 62
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "1938861639623819235",
+          "is_deprecated": false,
+          "name": "BB",
+          "source_location": {
+            "file": "../../tests/t30002/t30002.cc",
+            "line": 62
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "145302773464360955",
+      "is_deprecated": false,
+      "name": "B",
+      "source_location": {
+        "file": "../../tests/t30002/t30002.cc",
+        "line": 62
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30002_package",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "301858476377711436",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1207764290216680521",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "563861734550555261",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "839146342143718390",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1650835159458422245",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1164966689017271053",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "695366113361481509",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1267709074800873528",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "299262817531370604",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "561239706327729436",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1415398383158410524",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "532437874530119999",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "899091126727901939",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1453242941322376182",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "384833776371876986",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1199527037490355138",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "620689743711615190",
+      "source": "2255521339657425355",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t30002"
+}
+```
diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg
index 48d097b8..aa760946 100644
--- a/docs/test_cases/t30002_package.svg
+++ b/docs/test_cases/t30002_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:1462px;height:402px;" version="1.1" viewBox="0 0 1462 402" width="1462px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4unevg9z0a90" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fifs16tu8m0ze" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,113 +9,113 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="22,219,39,219,46,241.2969,1440,241.2969,1440,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="22,219,39,219,46,241.2969,1440,241.2969,1440,390,22,390,22,219" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="241.2969" y2="241.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="46,262,74,262,81,284.2969,1416,284.2969,1416,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L9" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L9" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="46,262,74,262,81,284.2969,1416,284.2969,1416,366,46,366,46,262" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="81" y1="284.2969" y2="284.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="50" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L62" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="706,24,722,24,729,46.2969,836,46.2969,836,195,706,195,706,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L62" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="706,24,722,24,729,46.2969,836,46.2969,836,195,706,195,706,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="706" x2="729" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="710" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L62" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="730,67,756,67,763,89.2969,812,89.2969,812,171,730,171,730,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L62" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="730,67,756,67,763,89.2969,812,89.2969,812,171,730,171,730,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="730" x2="763" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="734" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="1358.5,297,1385.5,297,1392.5,319.2969,1399.5,319.2969,1399.5,349.5938,1358.5,349.5938,1358.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L10" target="_top" title="A1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L10" xlink:show="new" xlink:title="A1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="1358.5,297,1385.5,297,1392.5,319.2969,1399.5,319.2969,1399.5,349.5938,1358.5,349.5938,1358.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1358.5" x2="1392.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1362.5" y="311.9951">A1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="1282.5,297,1309.5,297,1316.5,319.2969,1323.5,319.2969,1323.5,349.5938,1282.5,349.5938,1282.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L13" target="_top" title="A2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L13" xlink:show="new" xlink:title="A2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="1282.5,297,1309.5,297,1316.5,319.2969,1323.5,319.2969,1323.5,349.5938,1282.5,349.5938,1282.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1282.5" x2="1316.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1286.5" y="311.9951">A2</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L16" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L16" xlink:show="new" xlink:title="A3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="1206.5,297,1233.5,297,1240.5,319.2969,1247.5,319.2969,1247.5,349.5938,1206.5,349.5938,1206.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L16" target="_top" title="A3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L16" xlink:show="new" xlink:title="A3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="1206.5,297,1233.5,297,1240.5,319.2969,1247.5,319.2969,1247.5,349.5938,1206.5,349.5938,1206.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1206.5" x2="1240.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1210.5" y="311.9951">A3</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L19" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L19" xlink:show="new" xlink:title="A4" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="1130.5,297,1157.5,297,1164.5,319.2969,1171.5,319.2969,1171.5,349.5938,1130.5,349.5938,1130.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L19" target="_top" title="A4" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L19" xlink:show="new" xlink:title="A4" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="1130.5,297,1157.5,297,1164.5,319.2969,1171.5,319.2969,1171.5,349.5938,1130.5,349.5938,1130.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1130.5" x2="1164.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1134.5" y="311.9951">A4</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L22" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L22" xlink:show="new" xlink:title="A5" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="1054.5,297,1081.5,297,1088.5,319.2969,1095.5,319.2969,1095.5,349.5938,1054.5,349.5938,1054.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L22" target="_top" title="A5" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L22" xlink:show="new" xlink:title="A5" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="1054.5,297,1081.5,297,1088.5,319.2969,1095.5,319.2969,1095.5,349.5938,1054.5,349.5938,1054.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="1054.5" x2="1088.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="1058.5" y="311.9951">A5</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L25" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L25" xlink:show="new" xlink:title="A6" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="978.5,297,1005.5,297,1012.5,319.2969,1019.5,319.2969,1019.5,349.5938,978.5,349.5938,978.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L25" target="_top" title="A6" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L25" xlink:show="new" xlink:title="A6" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="978.5,297,1005.5,297,1012.5,319.2969,1019.5,319.2969,1019.5,349.5938,978.5,349.5938,978.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="978.5" x2="1012.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="982.5" y="311.9951">A6</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L28" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L28" xlink:show="new" xlink:title="A7" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="902.5,297,929.5,297,936.5,319.2969,943.5,319.2969,943.5,349.5938,902.5,349.5938,902.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L28" target="_top" title="A7" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L28" xlink:show="new" xlink:title="A7" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="902.5,297,929.5,297,936.5,319.2969,943.5,319.2969,943.5,349.5938,902.5,349.5938,902.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="902.5" x2="936.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="906.5" y="311.9951">A7</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L31" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L31" xlink:show="new" xlink:title="A8" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="826.5,297,853.5,297,860.5,319.2969,867.5,319.2969,867.5,349.5938,826.5,349.5938,826.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L31" target="_top" title="A8" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L31" xlink:show="new" xlink:title="A8" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="826.5,297,853.5,297,860.5,319.2969,867.5,319.2969,867.5,349.5938,826.5,349.5938,826.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="826.5" x2="860.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="830.5" y="311.9951">A8</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L34" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L34" xlink:show="new" xlink:title="A9" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="750.5,297,777.5,297,784.5,319.2969,791.5,319.2969,791.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L34" target="_top" title="A9" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L34" xlink:show="new" xlink:title="A9" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="750.5,297,777.5,297,784.5,319.2969,791.5,319.2969,791.5,349.5938,750.5,349.5938,750.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="750.5" x2="784.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="21" x="754.5" y="311.9951">A9</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L37" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L37" xlink:show="new" xlink:title="A10" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L37" target="_top" title="A10" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L37" xlink:show="new" xlink:title="A10" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="664.5,297,701.5,297,708.5,319.2969,715.5,319.2969,715.5,349.5938,664.5,349.5938,664.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="664.5" x2="708.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="668.5" y="311.9951">A10</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L40" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L40" xlink:show="new" xlink:title="A11" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L40" target="_top" title="A11" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L40" xlink:show="new" xlink:title="A11" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="578.5,297,615.5,297,622.5,319.2969,629.5,319.2969,629.5,349.5938,578.5,349.5938,578.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="578.5" x2="622.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="582.5" y="311.9951">A11</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L43" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L43" xlink:show="new" xlink:title="A12" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L43" target="_top" title="A12" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L43" xlink:show="new" xlink:title="A12" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="492.5,297,529.5,297,536.5,319.2969,543.5,319.2969,543.5,349.5938,492.5,349.5938,492.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="492.5" x2="536.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="496.5" y="311.9951">A12</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L46" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L46" xlink:show="new" xlink:title="A13" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L46" target="_top" title="A13" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L46" xlink:show="new" xlink:title="A13" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="406.5,297,443.5,297,450.5,319.2969,457.5,319.2969,457.5,349.5938,406.5,349.5938,406.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="406.5" x2="450.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="410.5" y="311.9951">A13</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L49" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L49" xlink:show="new" xlink:title="A14" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L49" target="_top" title="A14" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L49" xlink:show="new" xlink:title="A14" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="320.5,297,357.5,297,364.5,319.2969,371.5,319.2969,371.5,349.5938,320.5,349.5938,320.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="320.5" x2="364.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="324.5" y="311.9951">A14</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L52" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L52" xlink:show="new" xlink:title="A15" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L52" target="_top" title="A15" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L52" xlink:show="new" xlink:title="A15" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="234.5,297,271.5,297,278.5,319.2969,285.5,319.2969,285.5,349.5938,234.5,349.5938,234.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="234.5" x2="278.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="238.5" y="311.9951">A15</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L55" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L55" xlink:show="new" xlink:title="A16" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L55" target="_top" title="A16" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L55" xlink:show="new" xlink:title="A16" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="148.5,297,185.5,297,192.5,319.2969,199.5,319.2969,199.5,349.5938,148.5,349.5938,148.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="148.5" x2="192.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="152.5" y="311.9951">A16</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L58" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L58" xlink:show="new" xlink:title="A17" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L58" target="_top" title="A17" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L58" xlink:show="new" xlink:title="A17" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="62.5,297,99.5,297,106.5,319.2969,113.5,319.2969,113.5,349.5938,62.5,349.5938,62.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62.5" x2="106.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="31" x="66.5" y="311.9951">A17</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L62" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f4unevg9z0a90)" points="746,102,782,102,789,124.2969,796,124.2969,796,154.5938,746,154.5938,746,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L62" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30002/t30002.cc#L62" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#fifs16tu8m0ze)" points="746,102,782,102,789,124.2969,796,124.2969,796,154.5938,746,154.5938,746,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="746" x2="789" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="750" y="116.9951">BBB</text>
     </a>
diff --git a/docs/test_cases/t30003.md b/docs/test_cases/t30003.md
index f8407a0c..1b926eea 100644
--- a/docs/test_cases/t30003.md
+++ b/docs/test_cases/t30003.md
@@ -26,27 +26,123 @@ namespace t30003 {
 namespace ns1 {
 namespace ns2_v1_0_0 {
 class A { };
-}
+} // namespace ns2_v1_0_0
 
 namespace [[deprecated]] ns2_v0_9_0 {
 class A { };
-}
+} // namespace ns2_v0_9_0
 
 namespace {
 class Anon final { };
-}
-}
+} // namespace
+} // namespace ns1
 
 namespace [[deprecated]] ns3 {
 
 namespace ns1::ns2 {
 class Anon : public t30003::ns1::ns2_v1_0_0::A { };
-}
+} // namespace ns1::ns2
 
 class B : public ns1::ns2::Anon { };
-}
-}
-}
+} // namespace ns3
+} // namespace t30003
+} // namespace clanguml
 ```
 ## Generated UML diagrams
 ![t30003_package](./t30003_package.svg "Package deprecated attribute test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "clanguml::t30003::ns1",
+      "elements": [
+        {
+          "display_name": "clanguml::t30003::ns1::ns2_v1_0_0",
+          "id": "647755950450743637",
+          "is_deprecated": false,
+          "name": "ns2_v1_0_0",
+          "source_location": {
+            "file": "../../tests/t30003/t30003.cc",
+            "line": 5
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30003::ns1::ns2_v0_9_0",
+          "id": "1013406647495422406",
+          "is_deprecated": true,
+          "name": "ns2_v0_9_0",
+          "source_location": {
+            "file": "../../tests/t30003/t30003.cc",
+            "line": 9
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "600452871069546589",
+      "is_deprecated": false,
+      "name": "ns1",
+      "source_location": {
+        "file": "../../tests/t30003/t30003.cc",
+        "line": 4
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30003::ns3",
+      "elements": [
+        {
+          "display_name": "clanguml::t30003::ns3::ns1",
+          "elements": [
+            {
+              "display_name": "clanguml::t30003::ns3::ns1::ns2",
+              "id": "820462660523726751",
+              "is_deprecated": false,
+              "name": "ns2",
+              "source_location": {
+                "file": "../../tests/t30003/t30003.cc",
+                "line": 20
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "1209144861141334061",
+          "is_deprecated": false,
+          "name": "ns1",
+          "source_location": {
+            "file": "../../tests/t30003/t30003.cc",
+            "line": 20
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "427104404739526818",
+      "is_deprecated": true,
+      "name": "ns3",
+      "source_location": {
+        "file": "../../tests/t30003/t30003.cc",
+        "line": 18
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30003_package",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "820462660523726751",
+      "source": "427104404739526818",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "647755950450743637",
+      "source": "820462660523726751",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t30003"
+}
+```
diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg
index a216c1b2..8405efa9 100644
--- a/docs/test_cases/t30003_package.svg
+++ b/docs/test_cases/t30003_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="392px" preserveAspectRatio="none" style="width:343px;height:392px;" version="1.1" viewBox="0 0 343 392" width="343px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1gfb0gbjbx4xn" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1guc8e6qugndd" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,35 +9,35 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gfb0gbjbx4xn)" points="22,276,57,276,64,298.2969,319,298.2969,319,380,22,380,22,276" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L4" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L4" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1guc8e6qugndd)" points="22,276,57,276,64,298.2969,319,298.2969,319,380,22,380,22,276" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="64" y1="298.2969" y2="298.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="26" y="290.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gfb0gbjbx4xn)" points="175,32.28,210,32.28,217,54.5769,321,54.5769,321,244,175,244,175,32.28" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L18" target="_top" title="ns3" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L18" xlink:show="new" xlink:title="ns3" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1guc8e6qugndd)" points="175,32.28,210,32.28,217,54.5769,321,54.5769,321,244,175,244,175,32.28" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="175" x2="217" y1="54.5769" y2="54.5769"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="179" y="47.2751">ns3</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="203" y="69.572">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gfb0gbjbx4xn)" points="207,108,242,108,249,130.2969,289,130.2969,289,212,207,212,207,108" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L20" target="_top" title="ns1" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns1" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1guc8e6qugndd)" points="207,108,242,108,249,130.2969,289,130.2969,289,212,207,212,207,108" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="207" x2="249" y1="130.2969" y2="130.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="211" y="122.9951">ns1</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gfb0gbjbx4xn)" points="193.5,311,288.5,311,295.5,333.2969,302.5,333.2969,302.5,363.5938,193.5,363.5938,193.5,311" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L5" target="_top" title="ns2_v1_0_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L5" xlink:show="new" xlink:title="ns2_v1_0_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1guc8e6qugndd)" points="193.5,311,288.5,311,295.5,333.2969,302.5,333.2969,302.5,363.5938,193.5,363.5938,193.5,311" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="193.5" x2="295.5" y1="333.2969" y2="333.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="197.5" y="325.9951">ns2_v1_0_0</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gfb0gbjbx4xn)" points="38,311,133,311,140,333.2969,158,333.2969,158,363.5938,38,363.5938,38,311" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L9" target="_top" title="ns2_v0_9_0" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L9" xlink:show="new" xlink:title="ns2_v0_9_0" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1guc8e6qugndd)" points="38,311,133,311,140,333.2969,158,333.2969,158,363.5938,38,363.5938,38,311" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38" x2="140" y1="333.2969" y2="333.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="89" x="42" y="325.9951">ns2_v0_9_0</text>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-style="italic" lengthAdjust="spacingAndGlyphs" textLength="98" x="53" y="348.292">«deprecated»</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gfb0gbjbx4xn)" points="223.5,143,258.5,143,265.5,165.2969,272.5,165.2969,272.5,195.5938,223.5,195.5938,223.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L20" target="_top" title="ns2" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30003/t30003.cc#L20" xlink:show="new" xlink:title="ns2" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1guc8e6qugndd)" points="223.5,143,258.5,143,265.5,165.2969,272.5,165.2969,272.5,195.5938,223.5,195.5938,223.5,143" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="223.5" x2="265.5" y1="165.2969" y2="165.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="29" x="227.5" y="157.9951">ns2</text>
     </a>
diff --git a/docs/test_cases/t30004.md b/docs/test_cases/t30004.md
index df36dab7..48da7baa 100644
--- a/docs/test_cases/t30004.md
+++ b/docs/test_cases/t30004.md
@@ -58,3 +58,91 @@ namespace CCC {
 ```
 ## Generated UML diagrams
 ![t30004_package](./t30004_package.svg "PlantUML package decorators test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "comment": {
+        "formatted": "@uml{style[#green]}",
+        "raw": "/// @uml{style[#green]}"
+      },
+      "display_name": "clanguml::t30004::A",
+      "elements": [
+        {
+          "comment": {
+            "formatted": "@uml{note[ bottom ] Package AAA.}",
+            "raw": "/// @uml{note[ bottom ] Package AAA.}"
+          },
+          "display_name": "clanguml::t30004::A::AAA",
+          "id": "1517185300862579159",
+          "is_deprecated": false,
+          "name": "AAA",
+          "source_location": {
+            "file": "../../tests/t30004/t30004.cc",
+            "line": 8
+          },
+          "type": "namespace"
+        },
+        {
+          "comment": {
+            "formatted": "\\uml{note[right] Package BBB.}",
+            "raw": "/// \\uml{note[right] Package BBB.}"
+          },
+          "display_name": "clanguml::t30004::A::BBB",
+          "id": "1982379087062354928",
+          "is_deprecated": false,
+          "name": "BBB",
+          "source_location": {
+            "file": "../../tests/t30004/t30004.cc",
+            "line": 12
+          },
+          "type": "namespace"
+        },
+        {
+          "comment": {
+            "formatted": "\n @uml{note:t30004_package[bottom] CCCC package note.}\n This is package CCC.",
+            "raw": "///\n/// @uml{note:t30004_package[bottom] CCCC package note.}\n/// This is package CCC."
+          },
+          "display_name": "clanguml::t30004::A::CCC",
+          "id": "2304726195556701567",
+          "is_deprecated": false,
+          "name": "CCC",
+          "source_location": {
+            "file": "../../tests/t30004/t30004.cc",
+            "line": 18
+          },
+          "type": "namespace"
+        },
+        {
+          "comment": {
+            "formatted": "@uml{style[#pink;line:red;line.bold;text:red]}\n\\uml{note[top] We skipped DDD.}",
+            "raw": "/// @uml{style[#pink;line:red;line.bold;text:red]}\n/// \\uml{note[top] We skipped DDD.}"
+          },
+          "display_name": "clanguml::t30004::A::EEE",
+          "id": "1084924732216290779",
+          "is_deprecated": false,
+          "name": "EEE",
+          "source_location": {
+            "file": "../../tests/t30004/t30004.cc",
+            "line": 27
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "33410665874039845",
+      "is_deprecated": false,
+      "name": "A",
+      "source_location": {
+        "file": "../../tests/t30004/t30004.cc",
+        "line": 5
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30004_package",
+  "relationships": [],
+  "using_namespace": "clanguml::t30004"
+}
+```
diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg
index 7c0f42ba..ac0952e0 100644
--- a/docs/test_cases/t30004_package.svg
+++ b/docs/test_cases/t30004_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="253px" preserveAspectRatio="none" style="width:614px;height:253px;" version="1.1" viewBox="0 0 614 253" width="614px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1gxzvbevbz8n1" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1udy7nvb2cah4" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,40 +9,40 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#008000" filter="url(#f1gxzvbevbz8n1)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L5" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L5" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#008000" filter="url(#f1udy7nvb2cah4)" points="22,24,39,24,46,46.2969,592,46.2969,592,241,22,241,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="46" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="26" y="38.9951">A</text>
     </a>
-    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1gxzvbevbz8n1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M225,186 L225,211.1328 L335,211.1328 L335,196 L325,186 L225,186 " fill="#FBFB77" filter="url(#f1udy7nvb2cah4)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M325,186 L325,196 L335,196 L325,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="231" y="203.0669">Package AAA.</text>
-    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1gxzvbevbz8n1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M466,73 L466,98.1328 L576,98.1328 L576,83 L566,73 L466,73 " fill="#FBFB77" filter="url(#f1udy7nvb2cah4)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M566,73 L566,83 L576,83 L566,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="89" x="472" y="90.0669">Package BBB.</text>
-    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1gxzvbevbz8n1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M38,186 L38,211.1328 L190,211.1328 L190,196 L180,186 L38,186 " fill="#FBFB77" filter="url(#f1udy7nvb2cah4)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M180,186 L180,196 L190,196 L180,186 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="131" x="44" y="203.0669">CCCC package note.</text>
-    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1gxzvbevbz8n1)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M214.5,73 L214.5,98.1328 L345.5,98.1328 L345.5,83 L335.5,73 L214.5,73 " fill="#FBFB77" filter="url(#f1udy7nvb2cah4)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M335.5,73 L335.5,83 L345.5,83 L335.5,73 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="110" x="220.5" y="90.0669">We skipped DDD.</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gxzvbevbz8n1)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L8" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L8" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1udy7nvb2cah4)" points="126.5,59,165.5,59,172.5,81.2969,179.5,81.2969,179.5,111.5938,126.5,111.5938,126.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="126.5" x2="172.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="130.5" y="73.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gxzvbevbz8n1)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L12" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L12" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1udy7nvb2cah4)" points="381,59,417,59,424,81.2969,431,81.2969,431,111.5938,381,111.5938,381,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="381" x2="424" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="385" y="73.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gxzvbevbz8n1)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L18" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L18" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1udy7nvb2cah4)" points="38.5,59,77.5,59,84.5,81.2969,91.5,81.2969,91.5,111.5938,38.5,111.5938,38.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="84.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="42.5" y="73.9951">CCC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
-      <polygon fill="#FFC0CB" filter="url(#f1gxzvbevbz8n1)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L27" target="_top" title="EEE" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30004/t30004.cc#L27" xlink:show="new" xlink:title="EEE" xlink:type="simple">
+      <polygon fill="#FFC0CB" filter="url(#f1udy7nvb2cah4)" points="370.5,172,403.5,172,410.5,194.2969,417.5,194.2969,417.5,224.5938,370.5,224.5938,370.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="370.5" x2="410.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="27" x="374.5" y="186.9951">EEE</text>
     </a>
diff --git a/docs/test_cases/t30005.md b/docs/test_cases/t30005.md
index 273f2b41..fbbe02ef 100644
--- a/docs/test_cases/t30005.md
+++ b/docs/test_cases/t30005.md
@@ -50,3 +50,138 @@ struct C2 {
 ```
 ## Generated UML diagrams
 ![t30005_package](./t30005_package.svg "Package namespace alias test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "clanguml::t30005::A",
+      "elements": [
+        {
+          "display_name": "clanguml::t30005::A::AA",
+          "elements": [
+            {
+              "display_name": "clanguml::t30005::A::AA::AAA",
+              "id": "914090901927655181",
+              "is_deprecated": false,
+              "name": "AAA",
+              "source_location": {
+                "file": "../../tests/t30005/t30005.cc",
+                "line": 4
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "1777547159021391040",
+          "is_deprecated": false,
+          "name": "AA",
+          "source_location": {
+            "file": "../../tests/t30005/t30005.cc",
+            "line": 4
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "1768303675686131578",
+      "is_deprecated": false,
+      "name": "A",
+      "source_location": {
+        "file": "../../tests/t30005/t30005.cc",
+        "line": 4
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30005::B",
+      "elements": [
+        {
+          "display_name": "clanguml::t30005::B::BB",
+          "elements": [
+            {
+              "display_name": "clanguml::t30005::B::BB::BBB",
+              "id": "1871026935460001668",
+              "is_deprecated": false,
+              "name": "BBB",
+              "source_location": {
+                "file": "../../tests/t30005/t30005.cc",
+                "line": 8
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "1696631362104244809",
+          "is_deprecated": false,
+          "name": "BB",
+          "source_location": {
+            "file": "../../tests/t30005/t30005.cc",
+            "line": 8
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "378529216628023051",
+      "is_deprecated": false,
+      "name": "B",
+      "source_location": {
+        "file": "../../tests/t30005/t30005.cc",
+        "line": 8
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30005::C",
+      "elements": [
+        {
+          "display_name": "clanguml::t30005::C::CC",
+          "elements": [
+            {
+              "display_name": "clanguml::t30005::C::CC::CCC",
+              "id": "1763279540133487999",
+              "is_deprecated": false,
+              "name": "CCC",
+              "source_location": {
+                "file": "../../tests/t30005/t30005.cc",
+                "line": 16
+              },
+              "type": "namespace"
+            }
+          ],
+          "id": "2134234141727442046",
+          "is_deprecated": false,
+          "name": "CC",
+          "source_location": {
+            "file": "../../tests/t30005/t30005.cc",
+            "line": 16
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "1041076320925403190",
+      "is_deprecated": false,
+      "name": "C",
+      "source_location": {
+        "file": "../../tests/t30005/t30005.cc",
+        "line": 16
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30005_package",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "914090901927655181",
+      "source": "1871026935460001668",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "914090901927655181",
+      "source": "1763279540133487999",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t30005"
+}
+```
diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg
index a4e5785d..667219f3 100644
--- a/docs/test_cases/t30005_package.svg
+++ b/docs/test_cases/t30005_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="402px" preserveAspectRatio="none" style="width:332px;height:402px;" version="1.1" viewBox="0 0 332 402" width="332px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f11cw2tjj5nq5s" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1byyy7r1mgi8h" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,48 +9,48 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L4" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="98,219,115,219,122,241.2969,232,241.2969,232,390,98,390,98,219" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="98" x2="122" y1="241.2969" y2="241.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="102" y="233.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L4" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="122,262,150,262,157,284.2969,208,284.2969,208,366,122,366,122,262" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="122" x2="157" y1="284.2969" y2="284.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="126" y="276.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L8" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="22,24,38,24,45,46.2969,152,46.2969,152,195,22,195,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="45" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="26" y="38.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L8" target="_top" title="BB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="46,67,72,67,79,89.2969,128,89.2969,128,171,46,171,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="79" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="20" x="50" y="81.9951">BB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L16" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="176,24,193,24,200,46.2969,310,46.2969,310,195,176,195,176,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="176" x2="200" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="180" y="38.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L16" target="_top" title="CC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="200,67,228,67,235,89.2969,286,89.2969,286,171,200,171,200,67" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="200" x2="235" y1="89.2969" y2="89.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="204" y="81.9951">CC</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L4" target="_top" title="AAA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L4" xlink:show="new" xlink:title="AAA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="138.5,297,177.5,297,184.5,319.2969,191.5,319.2969,191.5,349.5938,138.5,349.5938,138.5,297" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="138.5" x2="184.5" y1="319.2969" y2="319.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="142.5" y="311.9951">AAA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L8" target="_top" title="BBB" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L8" xlink:show="new" xlink:title="BBB" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="62,102,98,102,105,124.2969,112,124.2969,112,154.5938,62,154.5938,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="105" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="30" x="66" y="116.9951">BBB</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f11cw2tjj5nq5s)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L16" target="_top" title="CCC" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30005/t30005.cc#L16" xlink:show="new" xlink:title="CCC" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1byyy7r1mgi8h)" points="216.5,102,255.5,102,262.5,124.2969,269.5,124.2969,269.5,154.5938,216.5,154.5938,216.5,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="216.5" x2="262.5" y1="124.2969" y2="124.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="33" x="220.5" y="116.9951">CCC</text>
     </a>
diff --git a/docs/test_cases/t30006.md b/docs/test_cases/t30006.md
index 859cc273..2c783572 100644
--- a/docs/test_cases/t30006.md
+++ b/docs/test_cases/t30006.md
@@ -50,3 +50,64 @@ struct A2 {
 ```
 ## Generated UML diagrams
 ![t30006_package](./t30006_package.svg "Package split namespace test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "clanguml::t30006::B",
+      "id": "1659090172211944144",
+      "is_deprecated": false,
+      "name": "B",
+      "source_location": {
+        "file": "../../tests/t30006/t30006.cc",
+        "line": 4
+      },
+      "type": "namespace"
+    },
+    {
+      "comment": {
+        "formatted": "\\uml{note[top] Top A note.}",
+        "raw": "/// \\uml{note[top] Top A note.}"
+      },
+      "display_name": "clanguml::t30006::A",
+      "id": "1499919423527579699",
+      "is_deprecated": false,
+      "name": "A",
+      "source_location": {
+        "file": "../../tests/t30006/t30006.cc",
+        "line": 9
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30006::C",
+      "id": "1380567463986115369",
+      "is_deprecated": false,
+      "name": "C",
+      "source_location": {
+        "file": "../../tests/t30006/t30006.cc",
+        "line": 15
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30006_package",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1659090172211944144",
+      "source": "1499919423527579699",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1380567463986115369",
+      "source": "1499919423527579699",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t30006"
+}
+```
diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg
index 8e55e359..b593cdbe 100644
--- a/docs/test_cases/t30006_package.svg
+++ b/docs/test_cases/t30006_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="270px" preserveAspectRatio="none" style="width:124px;height:270px;" version="1.1" viewBox="0 0 124 270" width="124px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1dmlriwy8qjwc" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f8fwbtq1drv3l" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,22 +9,22 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dmlriwy8qjwc)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30006/t30006.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30006/t30006.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f8fwbtq1drv3l)" points="6,206,22,206,29,228.2969,36,228.2969,36,258.5938,6,258.5938,6,206" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="6" x2="29" y1="228.2969" y2="228.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="10" y="220.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dmlriwy8qjwc)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30006/t30006.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30006/t30006.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f8fwbtq1drv3l)" points="38.5,93,55.5,93,62.5,115.2969,69.5,115.2969,69.5,145.5938,38.5,145.5938,38.5,93" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="115.2969" y2="115.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="107.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1dmlriwy8qjwc)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30006/t30006.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30006/t30006.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f8fwbtq1drv3l)" points="71.5,206,88.5,206,95.5,228.2969,102.5,228.2969,102.5,258.5938,71.5,258.5938,71.5,206" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="71.5" x2="95.5" y1="228.2969" y2="228.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="75.5" y="220.9951">C</text>
     </a>
-    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#f1dmlriwy8qjwc)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M7,8 L7,33.1328 L101,33.1328 L101,18 L91,8 L7,8 " fill="#FBFB77" filter="url(#f8fwbtq1drv3l)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M91,8 L91,18 L101,18 L91,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="73" x="13" y="25.0669">Top A note.</text>
     <path d="M54,33.01 C54,47.66 54,73.41 54,92.83 " fill="none" id="GMN1199-C_0001499919423527579699" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30007.md b/docs/test_cases/t30007.md
index 40e86e09..a0c5c263 100644
--- a/docs/test_cases/t30007.md
+++ b/docs/test_cases/t30007.md
@@ -58,3 +58,77 @@ struct A2 {
 ```
 ## Generated UML diagrams
 ![t30007_package](./t30007_package.svg "Package diagram layout hints test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "clanguml::t30007::B",
+      "id": "1852704221005355550",
+      "is_deprecated": false,
+      "name": "B",
+      "source_location": {
+        "file": "../../tests/t30007/t30007.cc",
+        "line": 4
+      },
+      "type": "namespace"
+    },
+    {
+      "comment": {
+        "formatted": "\\uml{note[top] Compare layout with t30006.}",
+        "raw": "/// \\uml{note[top] Compare layout with t30006.}"
+      },
+      "display_name": "clanguml::t30007::A",
+      "elements": [
+        {
+          "display_name": "clanguml::t30007::A::AA",
+          "id": "357722505818238170",
+          "is_deprecated": false,
+          "name": "AA",
+          "source_location": {
+            "file": "../../tests/t30007/t30007.cc",
+            "line": 10
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "870874615388866345",
+      "is_deprecated": false,
+      "name": "A",
+      "source_location": {
+        "file": "../../tests/t30007/t30007.cc",
+        "line": 9
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30007::C",
+      "id": "937791537887318363",
+      "is_deprecated": false,
+      "name": "C",
+      "source_location": {
+        "file": "../../tests/t30007/t30007.cc",
+        "line": 17
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30007_package",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1852704221005355550",
+      "source": "357722505818238170",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "937791537887318363",
+      "source": "357722505818238170",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t30007"
+}
+```
diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg
index 96a79144..d5477fa6 100644
--- a/docs/test_cases/t30007_package.svg
+++ b/docs/test_cases/t30007_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="277px" preserveAspectRatio="none" style="width:234px;height:277px;" version="1.1" viewBox="0 0 234 277" width="234px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fznsj68vh7ffw" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1v2wrgnqsvq1g" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,27 +9,27 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fznsj68vh7ffw)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30007/t30007.cc#L9" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30007/t30007.cc#L9" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1v2wrgnqsvq1g)" points="100.5,57,117.5,57,124.5,79.2969,209.5,79.2969,209.5,177,100.5,177,100.5,57" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="100.5" x2="124.5" y1="79.2969" y2="79.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="104.5" y="71.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fznsj68vh7ffw)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30007/t30007.cc#L4" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30007/t30007.cc#L4" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1v2wrgnqsvq1g)" points="182.5,213,198.5,213,205.5,235.2969,212.5,235.2969,212.5,265.5938,182.5,265.5938,182.5,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="182.5" x2="205.5" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="186.5" y="227.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fznsj68vh7ffw)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30007/t30007.cc#L10" target="_top" title="AA" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30007/t30007.cc#L10" xlink:show="new" xlink:title="AA" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1v2wrgnqsvq1g)" points="143.5,100,171.5,100,178.5,122.2969,185.5,122.2969,185.5,152.5938,143.5,152.5938,143.5,100" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="143.5" x2="178.5" y1="122.2969" y2="122.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="22" x="147.5" y="114.9951">AA</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fznsj68vh7ffw)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30007/t30007.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30007/t30007.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1v2wrgnqsvq1g)" points="116,213,133,213,140,235.2969,147,235.2969,147,265.5938,116,265.5938,116,213" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="116" x2="140" y1="235.2969" y2="235.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="120" y="227.9951">C</text>
     </a>
-    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#fznsj68vh7ffw)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M6,8 L6,33.1328 L211,33.1328 L211,18 L201,8 L6,8 " fill="#FBFB77" filter="url(#f1v2wrgnqsvq1g)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M201,8 L201,18 L211,18 L201,8 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="184" x="12" y="25.0669">Compare layout with t30006.</text>
     <path d="M108.5,33.03 C108.5,36.3613 108.5,40.2728 108.5,44.5714 C108.5,46.7207 108.5,48.9668 108.5,51.2855 C108.5,52.4448 108.5,53.6223 108.5,54.8149 C108.5,55.4112 108.5,56.0113 108.5,56.6148 " fill="none" id="GMN1211-C_0000870874615388866345" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t30008.md b/docs/test_cases/t30008.md
index 2b61f3b7..54a32b17 100644
--- a/docs/test_cases/t30008.md
+++ b/docs/test_cases/t30008.md
@@ -68,3 +68,155 @@ struct FF {
 ```
 ## Generated UML diagrams
 ![t30008_package](./t30008_package.svg "Dependants and dependencies package diagram filter test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "clanguml",
+      "elements": [
+        {
+          "display_name": "clanguml::t30008",
+          "id": "588296309731944574",
+          "is_deprecated": false,
+          "name": "t30008",
+          "source_location": {
+            "file": "../../tests/t30008/t30008.cc",
+            "line": 2
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "2174271399507040339",
+      "is_deprecated": false,
+      "name": "clanguml",
+      "source_location": {
+        "file": "../../tests/t30008/t30008.cc",
+        "line": 1
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30008::dependants",
+      "elements": [
+        {
+          "display_name": "clanguml::t30008::dependants::A",
+          "id": "2096441629244782012",
+          "is_deprecated": false,
+          "name": "A",
+          "source_location": {
+            "file": "../../tests/t30008/t30008.cc",
+            "line": 7
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30008::dependants::B",
+          "id": "500208250168931957",
+          "is_deprecated": false,
+          "name": "B",
+          "source_location": {
+            "file": "../../tests/t30008/t30008.cc",
+            "line": 10
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30008::dependants::C",
+          "id": "1095841247154575825",
+          "is_deprecated": false,
+          "name": "C",
+          "source_location": {
+            "file": "../../tests/t30008/t30008.cc",
+            "line": 15
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "1601960042765615222",
+      "is_deprecated": false,
+      "name": "dependants",
+      "source_location": {
+        "file": "../../tests/t30008/t30008.cc",
+        "line": 4
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30008::dependencies",
+      "elements": [
+        {
+          "display_name": "clanguml::t30008::dependencies::D",
+          "id": "912387297717034254",
+          "is_deprecated": false,
+          "name": "D",
+          "source_location": {
+            "file": "../../tests/t30008/t30008.cc",
+            "line": 27
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30008::dependencies::E",
+          "id": "1114997990364518938",
+          "is_deprecated": false,
+          "name": "E",
+          "source_location": {
+            "file": "../../tests/t30008/t30008.cc",
+            "line": 30
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30008::dependencies::F",
+          "id": "1062827161678172094",
+          "is_deprecated": false,
+          "name": "F",
+          "source_location": {
+            "file": "../../tests/t30008/t30008.cc",
+            "line": 35
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "2103969167872217960",
+      "is_deprecated": false,
+      "name": "dependencies",
+      "source_location": {
+        "file": "../../tests/t30008/t30008.cc",
+        "line": 23
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30008_package",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2096441629244782012",
+      "source": "500208250168931957",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "500208250168931957",
+      "source": "1095841247154575825",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "912387297717034254",
+      "source": "1114997990364518938",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1114997990364518938",
+      "source": "1062827161678172094",
+      "type": "dependency"
+    }
+  ],
+  "using_namespace": "clanguml::t30008"
+}
+```
diff --git a/docs/test_cases/t30008_package.svg b/docs/test_cases/t30008_package.svg
index fca2649e..e17827b0 100644
--- a/docs/test_cases/t30008_package.svg
+++ b/docs/test_cases/t30008_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="366px" preserveAspectRatio="none" style="width:306px;height:366px;" version="1.1" viewBox="0 0 306 366" width="306px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="fp3rhdh1h1fuy" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1utevlymqh430" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fp3rhdh1h1fuy)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L4" target="_top" title="dependants" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L4" xlink:show="new" xlink:title="dependants" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1utevlymqh430)" points="22,24,122,24,129,46.2969,132,46.2969,132,354,22,354,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="129" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="26" y="38.9951">dependants</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fp3rhdh1h1fuy)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L23" target="_top" title="dependencies" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L23" xlink:show="new" xlink:title="dependencies" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1utevlymqh430)" points="156,24,274,24,281,46.2969,284,46.2969,284,354,156,354,156,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="156" x2="281" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="160" y="38.9951">dependencies</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fp3rhdh1h1fuy)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L7" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L7" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1utevlymqh430)" points="61.5,285,78.5,285,85.5,307.2969,92.5,307.2969,92.5,337.5938,61.5,337.5938,61.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="299.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fp3rhdh1h1fuy)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L10" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L10" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1utevlymqh430)" points="62,172,78,172,85,194.2969,92,194.2969,92,224.5938,62,224.5938,62,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="62" x2="85" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="66" y="186.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fp3rhdh1h1fuy)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L15" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L15" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1utevlymqh430)" points="61.5,59,78.5,59,85.5,81.2969,92.5,81.2969,92.5,111.5938,61.5,111.5938,61.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="61.5" x2="85.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="65.5" y="73.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fp3rhdh1h1fuy)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L27" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L27" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1utevlymqh430)" points="204.5,285,221.5,285,228.5,307.2969,235.5,307.2969,235.5,337.5938,204.5,337.5938,204.5,285" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="204.5" x2="228.5" y1="307.2969" y2="307.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="208.5" y="299.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fp3rhdh1h1fuy)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L30" target="_top" title="E" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L30" xlink:show="new" xlink:title="E" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1utevlymqh430)" points="205.5,172,220.5,172,227.5,194.2969,234.5,194.2969,234.5,224.5938,205.5,224.5938,205.5,172" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="194.2969" y2="194.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="186.9951">E</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#fp3rhdh1h1fuy)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L35" target="_top" title="F" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30008/t30008.cc#L35" xlink:show="new" xlink:title="F" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1utevlymqh430)" points="205.5,59,220.5,59,227.5,81.2969,234.5,81.2969,234.5,111.5938,205.5,111.5938,205.5,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="205.5" x2="227.5" y1="81.2969" y2="81.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="9" x="209.5" y="73.9951">F</text>
     </a>
diff --git a/docs/test_cases/t30009.md b/docs/test_cases/t30009.md
index 3dd65cb1..47469e8a 100644
--- a/docs/test_cases/t30009.md
+++ b/docs/test_cases/t30009.md
@@ -48,3 +48,128 @@ namespace D {
 ```
 ## Generated UML diagrams
 ![t30009_package](./t30009_package.svg "Together layout hint test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "package",
+  "elements": [
+    {
+      "display_name": "clanguml::t30009::One",
+      "elements": [
+        {
+          "display_name": "clanguml::t30009::One::A",
+          "id": "1189741240939898414",
+          "is_deprecated": false,
+          "name": "A",
+          "source_location": {
+            "file": "../../tests/t30009/t30009.cc",
+            "line": 3
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30009::One::B",
+          "id": "209763670816643341",
+          "is_deprecated": false,
+          "name": "B",
+          "source_location": {
+            "file": "../../tests/t30009/t30009.cc",
+            "line": 5
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30009::One::C",
+          "id": "946522260503371974",
+          "is_deprecated": false,
+          "name": "C",
+          "source_location": {
+            "file": "../../tests/t30009/t30009.cc",
+            "line": 7
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30009::One::D",
+          "id": "1181245940399690936",
+          "is_deprecated": false,
+          "name": "D",
+          "source_location": {
+            "file": "../../tests/t30009/t30009.cc",
+            "line": 9
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "1187941209208108244",
+      "is_deprecated": false,
+      "name": "One",
+      "source_location": {
+        "file": "../../tests/t30009/t30009.cc",
+        "line": 2
+      },
+      "type": "namespace"
+    },
+    {
+      "display_name": "clanguml::t30009::Two",
+      "elements": [
+        {
+          "display_name": "clanguml::t30009::Two::A",
+          "id": "986505573514384282",
+          "is_deprecated": false,
+          "name": "A",
+          "source_location": {
+            "file": "../../tests/t30009/t30009.cc",
+            "line": 13
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30009::Two::B",
+          "id": "2156827588463114203",
+          "is_deprecated": false,
+          "name": "B",
+          "source_location": {
+            "file": "../../tests/t30009/t30009.cc",
+            "line": 15
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30009::Two::C",
+          "id": "1653274432960093632",
+          "is_deprecated": false,
+          "name": "C",
+          "source_location": {
+            "file": "../../tests/t30009/t30009.cc",
+            "line": 17
+          },
+          "type": "namespace"
+        },
+        {
+          "display_name": "clanguml::t30009::Two::D",
+          "id": "263095551354153183",
+          "is_deprecated": false,
+          "name": "D",
+          "source_location": {
+            "file": "../../tests/t30009/t30009.cc",
+            "line": 19
+          },
+          "type": "namespace"
+        }
+      ],
+      "id": "1940839474792549233",
+      "is_deprecated": false,
+      "name": "Two",
+      "source_location": {
+        "file": "../../tests/t30009/t30009.cc",
+        "line": 12
+      },
+      "type": "namespace"
+    }
+  ],
+  "name": "t30009_package",
+  "relationships": [],
+  "using_namespace": "clanguml::t30009"
+}
+```
diff --git a/docs/test_cases/t30009_package.svg b/docs/test_cases/t30009_package.svg
index 6ea3a7db..08b5acab 100644
--- a/docs/test_cases/t30009_package.svg
+++ b/docs/test_cases/t30009_package.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:639px;height:188px;" version="1.1" viewBox="0 0 639 188" width="639px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1gy789qmrbpbg" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1hzduun6bk19m" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,53 +9,53 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="22,24,60,24,67,46.2969,308,46.2969,308,176,22,176,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L2" target="_top" title="One" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L2" xlink:show="new" xlink:title="One" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="22,24,60,24,67,46.2969,308,46.2969,308,176,22,176,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="67" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="32" x="26" y="38.9951">One</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="332,24,372,24,379,46.2969,617,46.2969,617,176,332,176,332,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L12" target="_top" title="Two" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L12" xlink:show="new" xlink:title="Two" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="332,24,372,24,379,46.2969,617,46.2969,617,176,332,176,332,24" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="332" x2="379" y1="46.2969" y2="46.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="34" x="336" y="38.9951">Two</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="105,83,121,83,128,105.2969,135,105.2969,135,135.5938,105,135.5938,105,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L5" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L5" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="105,83,121,83,128,105.2969,135,105.2969,135,135.5938,105,135.5938,105,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="105" x2="128" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="109" y="97.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="38.5,83,55.5,83,62.5,105.2969,69.5,105.2969,69.5,135.5938,38.5,135.5938,38.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L9" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L9" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="38.5,83,55.5,83,62.5,105.2969,69.5,105.2969,69.5,135.5938,38.5,135.5938,38.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="38.5" x2="62.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="42.5" y="97.9951">D</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="236.5,83,253.5,83,260.5,105.2969,267.5,105.2969,267.5,135.5938,236.5,135.5938,236.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L3" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L3" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="236.5,83,253.5,83,260.5,105.2969,267.5,105.2969,267.5,135.5938,236.5,135.5938,236.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="236.5" x2="260.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="240.5" y="97.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="170.5,83,187.5,83,194.5,105.2969,201.5,105.2969,201.5,135.5938,170.5,135.5938,170.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L7" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L7" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="170.5,83,187.5,83,194.5,105.2969,201.5,105.2969,201.5,135.5938,170.5,135.5938,170.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="170.5" x2="194.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="174.5" y="97.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="348.5,83,365.5,83,372.5,105.2969,379.5,105.2969,379.5,135.5938,348.5,135.5938,348.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L13" target="_top" title="A" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L13" xlink:show="new" xlink:title="A" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="348.5,83,365.5,83,372.5,105.2969,379.5,105.2969,379.5,135.5938,348.5,135.5938,348.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="348.5" x2="372.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="352.5" y="97.9951">A</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="547,83,563,83,570,105.2969,577,105.2969,577,135.5938,547,135.5938,547,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L15" target="_top" title="B" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L15" xlink:show="new" xlink:title="B" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="547,83,563,83,570,105.2969,577,105.2969,577,135.5938,547,135.5938,547,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="547" x2="570" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="10" x="551" y="97.9951">B</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="480.5,83,497.5,83,504.5,105.2969,511.5,105.2969,511.5,135.5938,480.5,135.5938,480.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L17" target="_top" title="C" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L17" xlink:show="new" xlink:title="C" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="480.5,83,497.5,83,504.5,105.2969,511.5,105.2969,511.5,135.5938,480.5,135.5938,480.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="480.5" x2="504.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="484.5" y="97.9951">C</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
-      <polygon fill="#FFFFFF" filter="url(#f1gy789qmrbpbg)" points="414.5,83,431.5,83,438.5,105.2969,445.5,105.2969,445.5,135.5938,414.5,135.5938,414.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L19" target="_top" title="D" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t30009/t30009.cc#L19" xlink:show="new" xlink:title="D" xlink:type="simple">
+      <polygon fill="#FFFFFF" filter="url(#f1hzduun6bk19m)" points="414.5,83,431.5,83,438.5,105.2969,445.5,105.2969,445.5,135.5938,414.5,135.5938,414.5,83" style="stroke: #000000; stroke-width: 1.5;"/>
       <line style="stroke: #000000; stroke-width: 1.5;" x1="414.5" x2="438.5" y1="105.2969" y2="105.2969"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="11" x="418.5" y="97.9951">D</text>
     </a>
diff --git a/docs/test_cases/t40001.md b/docs/test_cases/t40001.md
index d4663270..ef8bd71f 100644
--- a/docs/test_cases/t40001.md
+++ b/docs/test_cases/t40001.md
@@ -28,3 +28,116 @@ diagrams:
 ## Source code
 ## Generated UML diagrams
 ![t40001_include](./t40001_include.svg "Basic include graph diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "include",
+  "elements": [
+    {
+      "display_name": "src",
+      "elements": [
+        {
+          "display_name": "src/t40001.cc",
+          "file_kind": "implementation",
+          "id": "1755015016680017839",
+          "name": "t40001.cc",
+          "type": "file"
+        }
+      ],
+      "id": "1387619747296316447",
+      "name": "src",
+      "type": "folder"
+    },
+    {
+      "display_name": "string",
+      "file_kind": "header",
+      "id": "1687197357150905926",
+      "name": "string",
+      "type": "file"
+    },
+    {
+      "display_name": "vector",
+      "file_kind": "header",
+      "id": "405203884025072971",
+      "name": "vector",
+      "type": "file"
+    },
+    {
+      "display_name": "include",
+      "elements": [
+        {
+          "display_name": "include/t40001_include1.h",
+          "file_kind": "header",
+          "id": "1926692816440595520",
+          "name": "t40001_include1.h",
+          "type": "file"
+        },
+        {
+          "display_name": "include/lib1",
+          "elements": [
+            {
+              "display_name": "include/lib1/lib1.h",
+              "file_kind": "header",
+              "id": "2193549214042244690",
+              "name": "lib1.h",
+              "type": "file"
+            }
+          ],
+          "id": "1687675335949018432",
+          "name": "lib1",
+          "type": "folder"
+        }
+      ],
+      "id": "989412417490706876",
+      "name": "include",
+      "type": "folder"
+    },
+    {
+      "display_name": "yaml-cpp/yaml.h",
+      "file_kind": "header",
+      "id": "1659736894483045485",
+      "name": "yaml-cpp/yaml.h",
+      "type": "file"
+    }
+  ],
+  "name": "t40001_include",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "1687197357150905926",
+      "source": "1755015016680017839",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "405203884025072971",
+      "source": "1755015016680017839",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1926692816440595520",
+      "source": "1755015016680017839",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "2193549214042244690",
+      "source": "1926692816440595520",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1659736894483045485",
+      "source": "1926692816440595520",
+      "type": "dependency"
+    },
+    {
+      "access": "public",
+      "destination": "1687197357150905926",
+      "source": "1926692816440595520",
+      "type": "dependency"
+    }
+  ]
+}
+```
diff --git a/docs/test_cases/t40001_include.svg b/docs/test_cases/t40001_include.svg
index 4d50cc51..14caaed2 100644
--- a/docs/test_cases/t40001_include.svg
+++ b/docs/test_cases/t40001_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="377px" preserveAspectRatio="none" style="width:676px;height:377px;" version="1.1" viewBox="0 0 676 377" width="676px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f4tmw85arurph" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1no39e38ibnuu" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,43 +9,43 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f4tmw85arurph)" points="187,24,218,24,225,46.2969,309,46.2969,309,111,187,111,187,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1no39e38ibnuu)" points="187,24,218,24,225,46.2969,309,46.2969,309,111,187,111,187,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="225" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="191" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f4tmw85arurph)" points="22,135,85,135,92,157.2969,211,157.2969,211,365,22,365,22,135" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1no39e38ibnuu)" points="22,135,85,135,92,157.2969,211,157.2969,211,365,22,365,22,135" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="92" y1="157.2969" y2="157.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="26" y="149.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f4tmw85arurph)" points="54,230,88,230,95,252.2969,179,252.2969,179,333,54,333,54,230" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1no39e38ibnuu)" points="54,230,88,230,95,252.2969,179,252.2969,179,333,54,333,54,230" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="54" x2="95" y1="252.2969" y2="252.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="58" y="244.9951">lib1</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f4tmw85arurph)" points="203,59,203,95.2969,293,95.2969,293,69,283,59,203,59" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40001/src/t40001.cc#L0" target="_top" title="t40001.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40001/src/t40001.cc#L0" xlink:show="new" xlink:title="t40001.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1no39e38ibnuu)" points="203,59,203,95.2969,293,95.2969,293,69,283,59,203,59" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M283,59 L283,69 L293,69 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="213" y="81.9951">t40001.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f4tmw85arurph)" points="46.5,170,46.5,206.2969,195.5,206.2969,195.5,180,185.5,170,46.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40001/include/t40001_include1.h#L0" target="_top" title="t40001_include1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40001/include/t40001_include1.h#L0" xlink:show="new" xlink:title="t40001_include1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1no39e38ibnuu)" points="46.5,170,46.5,206.2969,195.5,206.2969,195.5,180,185.5,170,46.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M185.5,170 L185.5,180 L195.5,180 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="129" x="56.5" y="192.9951">t40001_include1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40001/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40001/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f4tmw85arurph)" points="97.5,273,97.5,309.2969,154.5,309.2969,154.5,283,144.5,273,97.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40001/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40001/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1no39e38ibnuu)" points="97.5,273,97.5,309.2969,154.5,309.2969,154.5,283,144.5,273,97.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M144.5,273 L144.5,283 L154.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="107.5" y="295.9951">lib1.h</text>
     </a>
-    <polygon fill="#FEFECE" filter="url(#f4tmw85arurph)" points="393.5,273,393.5,309.2969,452.5,309.2969,452.5,283,442.5,273,393.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#f1no39e38ibnuu)" points="393.5,273,393.5,309.2969,452.5,309.2969,452.5,283,442.5,273,393.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M442.5,273 L442.5,283 L452.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="39" x="403.5" y="295.9951">string</text>
-    <polygon fill="#FEFECE" filter="url(#f4tmw85arurph)" points="301.5,170,301.5,206.2969,364.5,206.2969,364.5,180,354.5,170,301.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#f1no39e38ibnuu)" points="301.5,170,301.5,206.2969,364.5,206.2969,364.5,180,354.5,170,301.5,170" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M354.5,170 L354.5,180 L364.5,180 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="43" x="311.5" y="192.9951">vector</text>
-    <polygon fill="#FEFECE" filter="url(#f4tmw85arurph)" points="227.5,273,227.5,309.2969,358.5,309.2969,358.5,283,348.5,273,227.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FEFECE" filter="url(#f1no39e38ibnuu)" points="227.5,273,227.5,309.2969,358.5,309.2969,358.5,283,348.5,273,227.5,273" style="stroke: #000000; stroke-width: 1.5;"/>
     <path d="M348.5,273 L348.5,283 L358.5,283 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="111" x="237.5" y="295.9951">yaml-cpp/yaml.h</text>
-    <path d="M487.5,278.5 L487.5,303.6328 L654.5,303.6328 L654.5,288.5 L644.5,278.5 L487.5,278.5 " fill="#FBFB77" filter="url(#f4tmw85arurph)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M487.5,278.5 L487.5,303.6328 L654.5,303.6328 L654.5,288.5 L644.5,278.5 L487.5,278.5 " fill="#FBFB77" filter="url(#f1no39e38ibnuu)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M644.5,278.5 L644.5,288.5 L654.5,288.5 L644.5,278.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="146" x="493.5" y="295.5669">This is a lib1 include dir</text>
-    <path d="M400,175.5 L400,200.6328 L664,200.6328 L664,185.5 L654,175.5 L400,175.5 " fill="#FBFB77" filter="url(#f4tmw85arurph)" style="stroke: #A80036; stroke-width: 1.0;"/>
+    <path d="M400,175.5 L400,200.6328 L664,200.6328 L664,185.5 L654,175.5 L400,175.5 " fill="#FBFB77" filter="url(#f1no39e38ibnuu)" style="stroke: #A80036; stroke-width: 1.0;"/>
     <path d="M654,175.5 L654,185.5 L664,185.5 L654,175.5 " fill="#FBFB77" style="stroke: #A80036; stroke-width: 1.0;"/>
     <text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacingAndGlyphs" textLength="243" x="406" y="192.5669">This is a t40001_include1.h include file</text>
     <path d="M247.19,95.33 C246.91,123.45 250.93,178.61 284,206 C299.81,219.09 358.52,203.24 376,214 C395.8,226.19 408.53,250.17 415.68,267.94 " fill="none" id="C_0001755015016680017839-&gt;C_0001687197357150905926" style="stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;"/>
diff --git a/docs/test_cases/t40002.md b/docs/test_cases/t40002.md
index e51460be..7f2da126 100644
--- a/docs/test_cases/t40002.md
+++ b/docs/test_cases/t40002.md
@@ -29,3 +29,127 @@ diagrams:
 ## Source code
 ## Generated UML diagrams
 ![t40002_include](./t40002_include.svg "Cyclic include graph diagram test case")
+## Generated JSON models
+```json
+{
+  "diagram_type": "include",
+  "elements": [
+    {
+      "display_name": "src",
+      "elements": [
+        {
+          "display_name": "src/t40002.cc",
+          "file_kind": "implementation",
+          "id": "1489450289909741706",
+          "name": "t40002.cc",
+          "type": "file"
+        },
+        {
+          "display_name": "src/lib1",
+          "elements": [
+            {
+              "display_name": "src/lib1/lib1.cc",
+              "file_kind": "implementation",
+              "id": "1493913207373215402",
+              "name": "lib1.cc",
+              "type": "file"
+            }
+          ],
+          "id": "1284742705549910910",
+          "name": "lib1",
+          "type": "folder"
+        },
+        {
+          "display_name": "src/lib2",
+          "elements": [
+            {
+              "display_name": "src/lib2/lib2.cc",
+              "file_kind": "implementation",
+              "id": "1761875020766116446",
+              "name": "lib2.cc",
+              "type": "file"
+            }
+          ],
+          "id": "1397224709580110803",
+          "name": "lib2",
+          "type": "folder"
+        }
+      ],
+      "id": "1387619747296316447",
+      "name": "src",
+      "type": "folder"
+    },
+    {
+      "display_name": "include",
+      "elements": [
+        {
+          "display_name": "include/lib1",
+          "elements": [
+            {
+              "display_name": "include/lib1/lib1.h",
+              "file_kind": "header",
+              "id": "2193549214042244690",
+              "name": "lib1.h",
+              "type": "file"
+            }
+          ],
+          "id": "1687675335949018432",
+          "name": "lib1",
+          "type": "folder"
+        },
+        {
+          "display_name": "include/lib2",
+          "elements": [
+            {
+              "display_name": "include/lib2/lib2.h",
+              "file_kind": "header",
+              "id": "1969674835696841438",
+              "name": "lib2.h",
+              "type": "file"
+            }
+          ],
+          "id": "1248530620501446930",
+          "name": "lib2",
+          "type": "folder"
+        }
+      ],
+      "id": "989412417490706876",
+      "name": "include",
+      "type": "folder"
+    }
+  ],
+  "name": "t40002_include",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "2193549214042244690",
+      "source": "1489450289909741706",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1969674835696841438",
+      "source": "1489450289909741706",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "2193549214042244690",
+      "source": "1493913207373215402",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1969674835696841438",
+      "source": "1761875020766116446",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1969674835696841438",
+      "source": "2193549214042244690",
+      "type": "association"
+    }
+  ]
+}
+```
diff --git a/docs/test_cases/t40002_include.svg b/docs/test_cases/t40002_include.svg
index ab86090c..e184123c 100644
--- a/docs/test_cases/t40002_include.svg
+++ b/docs/test_cases/t40002_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="479px" preserveAspectRatio="none" style="width:412px;height:479px;" version="1.1" viewBox="0 0 412 479" width="412px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="ffdy0508lvmq0" width="300%" x="-1" y="-1">
+    <filter height="300%" id="f1i4tseq5l1mh" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,46 +9,46 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#ffdy0508lvmq0)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1i4tseq5l1mh)" points="22,24,53,24,60,46.2969,390,46.2969,390,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#ffdy0508lvmq0)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1i4tseq5l1mh)" points="46,67,80,67,87,89.2969,142,89.2969,142,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="87" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="50" y="81.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#ffdy0508lvmq0)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1i4tseq5l1mh)" points="270,67,304,67,311,89.2969,366,89.2969,366,154,270,154,270,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="270" x2="311" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="274" y="81.9951">lib2</text>
-    <polygon fill="#FFFFFF" filter="url(#ffdy0508lvmq0)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1i4tseq5l1mh)" points="65,202,128,202,135,224.2969,203,224.2969,203,467,65,467,65,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="65" x2="135" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="69" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#ffdy0508lvmq0)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1i4tseq5l1mh)" points="89,245,123,245,130,267.2969,179,267.2969,179,332,89,332,89,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="259.9951">lib1</text>
-    <polygon fill="#FFFFFF" filter="url(#ffdy0508lvmq0)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#f1i4tseq5l1mh)" points="89,356,123,356,130,378.2969,179,378.2969,179,443,89,443,89,356" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="89" x2="130" y1="378.2969" y2="378.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="28" x="93" y="370.9951">lib2</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#ffdy0508lvmq0)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/src/t40002.cc#L0" target="_top" title="t40002.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/src/t40002.cc#L0" xlink:show="new" xlink:title="t40002.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1i4tseq5l1mh)" points="161,102,161,138.2969,251,138.2969,251,112,241,102,161,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241,102 L241,112 L251,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="70" x="171" y="124.9951">t40002.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#ffdy0508lvmq0)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/src/lib1/lib1.cc#L0" target="_top" title="lib1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/src/lib1/lib1.cc#L0" xlink:show="new" xlink:title="lib1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1i4tseq5l1mh)" points="62,102,62,138.2969,126,138.2969,126,112,116,102,62,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="72" y="124.9951">lib1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#ffdy0508lvmq0)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/src/lib2/lib2.cc#L0" target="_top" title="lib2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/src/lib2/lib2.cc#L0" xlink:show="new" xlink:title="lib2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1i4tseq5l1mh)" points="286,102,286,138.2969,350,138.2969,350,112,340,102,286,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M340,102 L340,112 L350,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="44" x="296" y="124.9951">lib2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#ffdy0508lvmq0)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/include/lib1/lib1.h#L0" target="_top" title="lib1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/include/lib1/lib1.h#L0" xlink:show="new" xlink:title="lib1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1i4tseq5l1mh)" points="105.5,280,105.5,316.2969,162.5,316.2969,162.5,290,152.5,280,105.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,280 L152.5,290 L162.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="302.9951">lib1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#ffdy0508lvmq0)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/include/lib2/lib2.h#L0" target="_top" title="lib2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40002/include/lib2/lib2.h#L0" xlink:show="new" xlink:title="lib2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#f1i4tseq5l1mh)" points="105.5,391,105.5,427.2969,162.5,427.2969,162.5,401,152.5,391,105.5,391" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M152.5,391 L152.5,401 L162.5,401 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="37" x="115.5" y="413.9951">lib2.h</text>
     </a>
diff --git a/docs/test_cases/t40003.md b/docs/test_cases/t40003.md
index d5fc9c01..a9c088ef 100644
--- a/docs/test_cases/t40003.md
+++ b/docs/test_cases/t40003.md
@@ -27,3 +27,179 @@ diagrams:
 ## Source code
 ## Generated UML diagrams
 ![t40003_include](./t40003_include.svg "Dependants and dependencies include diagram filter test")
+## Generated JSON models
+```json
+{
+  "diagram_type": "include",
+  "elements": [
+    {
+      "display_name": "src",
+      "elements": [
+        {
+          "display_name": "src/dependants",
+          "elements": [
+            {
+              "display_name": "src/dependants/t1.cc",
+              "file_kind": "implementation",
+              "id": "1215324434184692437",
+              "name": "t1.cc",
+              "type": "file"
+            }
+          ],
+          "id": "1128556599972003761",
+          "name": "dependants",
+          "type": "folder"
+        },
+        {
+          "display_name": "src/dependencies",
+          "elements": [
+            {
+              "display_name": "src/dependencies/t2.cc",
+              "file_kind": "implementation",
+              "id": "2215849176605856058",
+              "name": "t2.cc",
+              "type": "file"
+            }
+          ],
+          "id": "2015386828772336316",
+          "name": "dependencies",
+          "type": "folder"
+        }
+      ],
+      "id": "1387619747296316447",
+      "name": "src",
+      "type": "folder"
+    },
+    {
+      "display_name": "include",
+      "elements": [
+        {
+          "display_name": "include/dependants",
+          "elements": [
+            {
+              "display_name": "include/dependants/t3.h",
+              "file_kind": "header",
+              "id": "60001020671836182",
+              "name": "t3.h",
+              "type": "file"
+            },
+            {
+              "display_name": "include/dependants/t2.h",
+              "file_kind": "header",
+              "id": "1921842892192045013",
+              "name": "t2.h",
+              "type": "file"
+            },
+            {
+              "display_name": "include/dependants/t1.h",
+              "file_kind": "header",
+              "id": "2295271780650013565",
+              "name": "t1.h",
+              "type": "file"
+            }
+          ],
+          "id": "1763526330848915994",
+          "name": "dependants",
+          "type": "folder"
+        },
+        {
+          "display_name": "include/dependencies",
+          "elements": [
+            {
+              "display_name": "include/dependencies/t3.h",
+              "file_kind": "header",
+              "id": "1226843223635488673",
+              "name": "t3.h",
+              "type": "file"
+            },
+            {
+              "display_name": "include/dependencies/t2.h",
+              "file_kind": "header",
+              "id": "1849348825646635129",
+              "name": "t2.h",
+              "type": "file"
+            },
+            {
+              "display_name": "include/dependencies/t1.h",
+              "file_kind": "header",
+              "id": "1120257488305564427",
+              "name": "t1.h",
+              "type": "file"
+            },
+            {
+              "display_name": "include/dependencies/t5.h",
+              "file_kind": "header",
+              "id": "2106129159239499468",
+              "name": "t5.h",
+              "type": "file"
+            }
+          ],
+          "id": "1833478793852674517",
+          "name": "dependencies",
+          "type": "folder"
+        }
+      ],
+      "id": "989412417490706876",
+      "name": "include",
+      "type": "folder"
+    }
+  ],
+  "name": "t40003_include",
+  "relationships": [
+    {
+      "access": "public",
+      "destination": "60001020671836182",
+      "source": "1215324434184692437",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1882940911178525353",
+      "source": "1215324434184692437",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1226843223635488673",
+      "source": "2215849176605856058",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "2106129159239499468",
+      "source": "2215849176605856058",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1921842892192045013",
+      "source": "60001020671836182",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "2295271780650013565",
+      "source": "1921842892192045013",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1849348825646635129",
+      "source": "1226843223635488673",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1120257488305564427",
+      "source": "1849348825646635129",
+      "type": "association"
+    },
+    {
+      "access": "public",
+      "destination": "1120257488305564427",
+      "source": "2106129159239499468",
+      "type": "association"
+    }
+  ]
+}
+```
diff --git a/docs/test_cases/t40003_include.svg b/docs/test_cases/t40003_include.svg
index 6719d62d..cb1d7c74 100644
--- a/docs/test_cases/t40003_include.svg
+++ b/docs/test_cases/t40003_include.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentScriptType="application/ecmascript" contentStyleType="text/css" height="560px" preserveAspectRatio="none" style="width:395px;height:560px;" version="1.1" viewBox="0 0 395 560" width="395px" zoomAndPan="magnify">
   <defs>
-    <filter height="300%" id="f1ak9epenffkss" width="300%" x="-1" y="-1">
+    <filter height="300%" id="fp0v0hynj181f" width="300%" x="-1" y="-1">
       <feGaussianBlur result="blurOut" stdDeviation="2.0"/>
       <feColorMatrix in="blurOut" result="blurOut2" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 .4 0"/>
       <feOffset dx="4.0" dy="4.0" in="blurOut2" result="blurOut3"/>
@@ -9,66 +9,66 @@
     <style type="text/css">a:hover { text-decoration: underline; }</style>
   </defs>
   <g>
-    <polygon fill="#FFFFFF" filter="url(#f1ak9epenffkss)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fp0v0hynj181f)" points="22,24,53,24,60,46.2969,332,46.2969,332,178,22,178,22,24" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="22" x2="60" y1="46.2969" y2="46.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="25" x="26" y="38.9951">src</text>
-    <polygon fill="#FFFFFF" filter="url(#f1ak9epenffkss)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fp0v0hynj181f)" points="46,67,146,67,153,89.2969,156,89.2969,156,154,46,154,46,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="46" x2="153" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="50" y="81.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f1ak9epenffkss)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fp0v0hynj181f)" points="180,67,298,67,305,89.2969,308,89.2969,308,154,180,154,180,67" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="180" x2="305" y1="89.2969" y2="89.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="184" y="81.9951">dependencies</text>
-    <polygon fill="#FFFFFF" filter="url(#f1ak9epenffkss)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fp0v0hynj181f)" points="29,202,92,202,99,224.2969,373,224.2969,373,548,29,548,29,202" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="29" x2="99" y1="224.2969" y2="224.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="57" x="33" y="216.9951">include</text>
-    <polygon fill="#FFFFFF" filter="url(#f1ak9epenffkss)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fp0v0hynj181f)" points="53,245,153,245,160,267.2969,163,267.2969,163,524,53,524,53,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="53" x2="160" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="94" x="57" y="259.9951">dependants</text>
-    <polygon fill="#FFFFFF" filter="url(#f1ak9epenffkss)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
+    <polygon fill="#FFFFFF" filter="url(#fp0v0hynj181f)" points="187,245,305,245,312,267.2969,349,267.2969,349,524,187,524,187,245" style="stroke: #000000; stroke-width: 1.5;"/>
     <line style="stroke: #000000; stroke-width: 1.5;" x1="187" x2="312" y1="267.2969" y2="267.2969"/>
     <text fill="#000000" font-family="sans-serif" font-size="14" font-weight="bold" lengthAdjust="spacingAndGlyphs" textLength="112" x="191" y="259.9951">dependencies</text>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/src/dependants/t1.cc#L0" target="_top" title="t1.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/src/dependants/t1.cc#L0" xlink:show="new" xlink:title="t1.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="72,102,72,138.2969,126,138.2969,126,112,116,102,72,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M116,102 L116,112 L126,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="82" y="124.9951">t1.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/src/dependencies/t2.cc#L0" target="_top" title="t2.cc" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/src/dependencies/t2.cc#L0" xlink:show="new" xlink:title="t2.cc" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="222,102,222,138.2969,276,138.2969,276,112,266,102,222,102" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M266,102 L266,112 L276,112 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="34" x="232" y="124.9951">t2.cc</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependants/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependants/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="75.5,280,75.5,316.2969,122.5,316.2969,122.5,290,112.5,280,75.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,280 L112.5,290 L122.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependants/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependants/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="75.5,376,75.5,412.2969,122.5,412.2969,122.5,386,112.5,376,75.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,376 L112.5,386 L122.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="398.9951">t2.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependants/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependants/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependants/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependants/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="75.5,472,75.5,508.2969,122.5,508.2969,122.5,482,112.5,472,75.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M112.5,472 L112.5,482 L122.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="85.5" y="494.9951">t1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependencies/t3.h#L0" target="_top" title="t3.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependencies/t3.h#L0" xlink:show="new" xlink:title="t3.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="204.5,280,204.5,316.2969,251.5,316.2969,251.5,290,241.5,280,204.5,280" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M241.5,280 L241.5,290 L251.5,290 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="214.5" y="302.9951">t3.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependencies/t2.h#L0" target="_top" title="t2.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependencies/t2.h#L0" xlink:show="new" xlink:title="t2.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="203.5,376,203.5,412.2969,250.5,412.2969,250.5,386,240.5,376,203.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M240.5,376 L240.5,386 L250.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="213.5" y="398.9951">t2.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependencies/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependencies/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependencies/t1.h#L0" target="_top" title="t1.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependencies/t1.h#L0" xlink:show="new" xlink:title="t1.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="244.5,472,244.5,508.2969,291.5,508.2969,291.5,482,281.5,472,244.5,472" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M281.5,472 L281.5,482 L291.5,482 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="254.5" y="494.9951">t1.h</text>
     </a>
-    <a href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/4e404a362e540d69f96ed518544199529d5537d5/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
-      <polygon fill="#FEFECE" filter="url(#f1ak9epenffkss)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
+    <a href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependencies/t5.h#L0" target="_top" title="t5.h" xlink:actuate="onRequest" xlink:href="https://github.com/bkryza/clang-uml/blob/2ebc64a9fafd167f38788bed8f718d50e3883ea0/tests/t40003/include/dependencies/t5.h#L0" xlink:show="new" xlink:title="t5.h" xlink:type="simple">
+      <polygon fill="#FEFECE" filter="url(#fp0v0hynj181f)" points="285.5,376,285.5,412.2969,332.5,412.2969,332.5,386,322.5,376,285.5,376" style="stroke: #000000; stroke-width: 1.5;"/>
       <path d="M322.5,376 L322.5,386 L332.5,386 " fill="#FEFECE" style="stroke: #000000; stroke-width: 1.5;"/>
       <text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacingAndGlyphs" textLength="27" x="295.5" y="398.9951">t5.h</text>
     </a>
diff --git a/docs/test_cases/t90000.md b/docs/test_cases/t90000.md
index 47496b72..95ffd5ff 100644
--- a/docs/test_cases/t90000.md
+++ b/docs/test_cases/t90000.md
@@ -30,3 +30,4 @@ File t90000.cc
 ```
 ## Generated UML diagrams
 ![t90000_class](./t90000_class.svg "Basic config test")
+## Generated JSON models